- OpenBIOS - mail.coreboot.org

Re: [OpenBIOS] Solaris anyone?
by Nick Couchman 25 Apr '11

25 Apr '11

> Awesome! If you can make a note of what you had to do in order to get it > to work and post it to the list, I'm sure lots of people will be very > grateful :) I'll go back through and try to reproduce the issues and document how I worked around it. > > Okay - I missed this as when I was stepping through the installer I > didn't bother with any of the networking stuff. However there is > definitely a bug here - running tcpdump on the bridge interface shows > data packets with junk in them rather than a proper DHCP request, so I'm > wondering if OpenBIOS doesn't initialise something in the NIC correctly? > Or maybe it's another alignment issue with the the LANCE buffers? > > Anyway, I'll take a look but it may take me a little time to figure out > what's going on. Let me know if I can provide any further information. Sounds like you've reproduced the issue, but if I can provide any additional help, I'm happy to do so. -Nick -------- This e-mail may contain confidential and privileged material for the sole use of the intended recipient. If this email is not intended for you, or you are not responsible for the delivery of this message to the intended recipient, please note that this message may contain SEAKR Engineering (SEAKR) Privileged/Proprietary Information. In such a case, you are strictly prohibited from downloading, photocopying, distributing or otherwise using this message, its contents or attachments in any way. If you have received this message in error, please notify us immediately by replying to this e-mail and delete the message from your mailbox. Information contained in this message that does not relate to the business of SEAKR is neither endorsed by nor attributable to SEAKR.

2 1

Re: [OpenBIOS] Solaris anyone?
by Nick Couchman 23 Apr '11

23 Apr '11

On Sat, 2011-04-23 at 14:55 +0100, Mark Cave-Ayland wrote: > On 22/04/11 20:58, Nick Couchman wrote: > > > Thanks, again, Mark - this is fantastic! > > > > After booting the install successfully from the Solaris ISO/CDROM and > > getting through the initial configuration (on both Solaris 8 and 9), the > > install fails trying to label the hard drive. First, I see the > > following during the installer boot: > > > > WARNING: /iommu@0,10000000/sbus@0,10001000/espdma@5,8400000/esp@5,8800000/sd@0,0 (sd0): > > corrupt label - wrong magic number > > > > > > Then, after doing the system identification, I get the following: > > > > One or more disks are found, but one of the > > following problems exists: > > > > > Hardware failure > > > > > Unformatted disk. > > > > At which point I get dropped to a shell. If I try to use the format > > command from the shell, format cannot auto-configure the disk. Even if > > I try manually setting C/H/S parameters (either at qemu run time or in > > the format command), it does not seem to want to use the disk. This > > seems to happen whether I'm using an LVM volume or a file-based disk. > > Also, seems as though all changes are lost on the disk when I exit > > format and then immediately go back in. > > > > Ideas? Any further help/input/debugging I could provide? > > Hi Nick, > > Thanks again for testing this. The issue with Solaris not detecting the > disks is a known one - the following guide should point you in the right > direction: > > http://virtuallyfun.blogspot.com/2010/10/formatting-disks-for-solaris.html > > Also don't forget the "set scsi_options" part from Artyom's SPARC/QEMU > howto here: http://tyom.blogspot.com/2009/12/solaris-under-qemu-how-to.html > > I think it may actually be possible to come up with a patch for OpenBIOS > so that the scsi_options change isn't required - let me know how you get > on with the above links, and if it all seems to work I'll look at > creating the patch for you. > > Got a little further, but eventually ran into this when the Solaris installer tried to partition the formatted and labeled disk: Preparing system for Solaris install Configuring disk (c0t0d0) - Creating Solaris disk label (VTOC) Creating and checking UFS file systems - Creating / (c0t0d0s0) ERROR: File system creation failed for / (c0t0d0s0) ERROR: Could not check or create system critical file systems ERROR: Could not update disks with new configuration Could not update disks with new configuration I'm not sure if I need to do the partitioning with the format command ahead of time?? Thanks, Nick -------- This e-mail may contain confidential and privileged material for the sole use of the intended recipient. If this email is not intended for you, or you are not responsible for the delivery of this message to the intended recipient, please note that this message may contain SEAKR Engineering (SEAKR) Privileged/Proprietary Information. In such a case, you are strictly prohibited from downloading, photocopying, distributing or otherwise using this message, its contents or attachments in any way. If you have received this message in error, please notify us immediately by replying to this e-mail and delete the message from your mailbox. Information contained in this message that does not relate to the business of SEAKR is neither endorsed by nor attributable to SEAKR.

1 0

Re: [OpenBIOS] Solaris anyone?
by Nick Couchman 22 Apr '11

22 Apr '11

On Fri, 2011-04-22 at 08:08 +0100, Mark Cave-Ayland wrote: > With my previously posted patched applied: > > ./qemu-system-sparc -cdrom /home/build/src/qemu/sparcimage/sol8-cd1.iso > -boot d -nographic -prom-env 'auto-boot?=false' > > Configuration device id QEMU version 1 machine id 32 > CPUs: 1 x FMI,MB86904 > UUID: 00000000-0000-0000-0000-000000000000 > Welcome to OpenBIOS v1.0 built on Apr 20 2011 18:52 > Type 'help' for detailed information > > 0 > boot cdrom:d -v Not a bootable ELF image > Loading a.out image... > Loaded 7680 bytes > entry point is 0x4000 > bootpath: /iommu/sbus/espdma/esp/sd@2,0:d > > Jumping to entry point 00004000 for type 00000005... > switching to new context: > Size: 259040+54154+47486 Bytes > SunOS Release 5.8 Version Generic_108528-09 32-bit > Copyright 1983-2001 Sun Microsystems, Inc. All rights reserved. > Ethernet address = 52:54:0:12:34:56 > Using default device instance data > vac: enabled in write through mode > mem = 131072K (0x8000000) > avail mem = 110260224 > root nexus = SUNW,SPARCstation-5 > iommu0 at root: obio 0x10000000 > sbus0 at iommu0: obio 0x10001000 > dma0 at sbus0: SBus slot 5 0x8400000 > dma0 is /iommu@0,10000000/sbus@0,10001000/espdma@5,8400000 > /iommu@0,10000000/sbus@0,10001000/espdma@5,8400000/esp@5,8800000 (esp0): > esp-options=0x46 > esp0 at dma0: SBus slot 5 0x8800000 sparc ipl 4 > esp0 is /iommu@0,10000000/sbus@0,10001000/espdma@5,8400000/esp@5,8800000 > sd2 at esp0: target 2 lun 0 > sd2 is > /iommu@0,10000000/sbus@0,10001000/espdma@5,8400000/esp@5,8800000/sd@2,0 > root on > /iommu@0,10000000/sbus@0,10001000/espdma@5,8400000/esp@5,8800000/sd@2,0:b fstype > ufs > obio0 at root > obio0 at obio0: obio 0x100000, sparc ipl 12 > zs0 is /obio/zs@0,100000 > obio1 at obio0: obio 0x0, sparc ipl 12 > zs1 is /obio/zs@0,0 > cpu0: FMI,MB86904 (mid 0 impl 0x0 ver 0x5 clock 170 MHz) > Configuring /dev and /devices > pseudo-device: devinfo0 > devinfo0 is /pseudo/devinfo@0 > tcx0 at sbus0: SBus slot 3 0x800000 and SBus slot 3 0x2000000 and SBus > slot 3 0x4000000 and SBus slot 3 0x6000000 and SBus slot 3 0xa000000 and > SBus slot 3 0xc000000 and SBus slot 3 0xe000000 and SBus slot 3 0x700000 > and SBus slot 3 0x200000 and SBus slot 3 0x300000 and SBus slot 3 0x0 > and SBus slot 3 0x240000 and SBus slot 3 0x280000 SBus level 5 sparc ipl 9 > tcx0 is /iommu@0,10000000/sbus@0,10001000/SUNW,tcx@3,800000 > tcx0: revision 0, screen 1024x768 > ledma0 at sbus0: SBus slot 5 0x8400010 > le0 at ledma0: SBus slot 5 0x8c00000 sparc ipl 6 > le0 is /iommu@0,10000000/sbus@0,10001000/ledma@5,8400010/le@5,8c00000 > sbusmem0 at sbus0: SBus slot 0 0x0 > sbusmem0 is /iommu@0,10000000/sbus@0,10001000/sbusmem@0,0 > sbusmem1 at sbus0: SBus slot 1 0x0 > sbusmem1 is /iommu@0,10000000/sbus@0,10001000/sbusmem@1,0 > sbusmem2 at sbus0: SBus slot 2 0x0 > sbusmem2 is /iommu@0,10000000/sbus@0,10001000/sbusmem@2,0 > sbusmem3 at sbus0: SBus slot 3 0x0 > sbusmem3 is /iommu@0,10000000/sbus@0,10001000/sbusmem@3,0 > sbusmem4 at sbus0: SBus slot 4 0x0 > sbusmem4 is /iommu@0,10000000/sbus@0,10001000/sbusmem@4,0 > sbusmem5 at sbus0: SBus slot 5 0x0 > sbusmem5 is /iommu@0,10000000/sbus@0,10001000/sbusmem@5,0 > pseudo-device: winlock0 > winlock0 is /pseudo/winlock@0 > pseudo-device: llc10 > llc10 is /pseudo/llc1@0 > pseudo-device: lofi0 > lofi0 is /pseudo/lofi@0 > pseudo-device: fcp0 > fcp0 is /pseudo/fcp@0 > Using RPC Bootparams for network configuration information. > Skipping interface le0 > Searching for configuration file(s)... > > Select a Language > > 0. English > 1. French > 2. German > 3. Italian > 4. Japanese > 5. Korean > 6. Simplified Chinese > 7. Spanish > 8. Swedish > 9. Traditional Chinese > > Please make a choice (0 - 9), or press h or ? for help: > > Wow. All I can say is thank you so much to everyone who helped me get > this far - in particular Blue, Artyom and Tarl. Does anyone know if we > are the first non-Sun firmware to be able to boot a Solaris kernel? > > Blue - I think you owe me that 1.1 release soon! > > > Happy Easter everyone! > > Mark. > > -- > Mark Cave-Ayland - Senior Technical Architect > PostgreSQL - PostGIS > Sirius Corporation plc - control through freedom > http://www.siriusit.co.uk > t: +44 870 608 0063 > > Sirius Labs: http://www.siriusit.co.uk/labs > > -- > OpenBIOS http://openbios.org/ > Mailinglist: http://lists.openbios.org/mailman/listinfo > Free your System - May the Forth be with you Awesome!! Thanks for all the hard work, Mark - this is fantastic!! -Nick -------- This e-mail may contain confidential and privileged material for the sole use of the intended recipient. If this email is not intended for you, or you are not responsible for the delivery of this message to the intended recipient, please note that this message may contain SEAKR Engineering (SEAKR) Privileged/Proprietary Information. In such a case, you are strictly prohibited from downloading, photocopying, distributing or otherwise using this message, its contents or attachments in any way. If you have received this message in error, please notify us immediately by replying to this e-mail and delete the message from your mailbox. Information contained in this message that does not relate to the business of SEAKR is neither endorsed by nor attributable to SEAKR.

1 0

[commit] r1035 - trunk/openbios-devel/arch/sparc32
by repository service 22 Apr '11

22 Apr '11

Author: mcayland Date: Fri Apr 22 02:13:53 2011 New Revision: 1035 URL: http://tracker.coreboot.org/trac/openbios/changeset/1035 Log: Implement new v3_memalloc romvec interface for allocating aligned memory. When attempting to load kadb from a Solaris 8 CD at boot, it seems that in order for kadb to allocate enough memory to load the kernel (and its modules) the /openprom/aligned-allocator property must be present with length zero. This has the additional side-effect that OpenBIOS memory allocations are redirected to a new romvec offset when this property is detected, which appears to have a similar interface to obp_dumb_memalloc() but with an extra alignment parameter. Hence we include a simple implementation which seems to be enough to be able to get kadb to load and attach to the kernel. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc32/call-romvec.S trunk/openbios-devel/arch/sparc32/lib.c trunk/openbios-devel/arch/sparc32/openprom.h trunk/openbios-devel/arch/sparc32/romvec.c trunk/openbios-devel/arch/sparc32/romvec.h trunk/openbios-devel/arch/sparc32/tree.fs Modified: trunk/openbios-devel/arch/sparc32/call-romvec.S ============================================================================== --- trunk/openbios-devel/arch/sparc32/call-romvec.S Fri Apr 8 11:03:59 2011 (r1034) +++ trunk/openbios-devel/arch/sparc32/call-romvec.S Fri Apr 22 02:13:53 2011 (r1035) @@ -89,4 +89,5 @@ ROMVEC_HANDLER(obp_getprop) ROMVEC_HANDLER(obp_setprop) ROMVEC_HANDLER(obp_nextprop) +ROMVEC_HANDLER(obp_memalloc) Modified: trunk/openbios-devel/arch/sparc32/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/lib.c Fri Apr 8 11:03:59 2011 (r1034) +++ trunk/openbios-devel/arch/sparc32/lib.c Fri Apr 22 02:13:53 2011 (r1035) @@ -347,10 +347,25 @@ map_pages(phys, virt, size, mode); } -char *obp_dumb_memalloc(char *va, unsigned int size) +char *obp_memalloc(char *va, unsigned int size, unsigned int align) { phys_addr_t phys; ucell virt; + + /* Claim physical memory */ + phys = ofmem_claim_phys(-1, size, align); + + /* Claim virtual memory */ + virt = ofmem_claim_virt(pointer2cell(va), size, 0); + + /* Map the memory */ + ofmem_map(phys, virt, size, ofmem_arch_default_translation_mode(phys)); + + return cell2pointer(virt); +} + +char *obp_dumb_memalloc(char *va, unsigned int size) +{ unsigned long align; int i; @@ -371,16 +386,7 @@ align++; } - /* Claim physical memory */ - phys = ofmem_claim_phys(-1, size, align); - - /* Claim virtual memory */ - virt = ofmem_claim_virt(pointer2cell(va), size, 0); - - /* Map the memory */ - ofmem_map(phys, virt, size, ofmem_arch_default_translation_mode(phys)); - - return cell2pointer(virt); + return obp_memalloc(va, size, align); } void obp_dumb_memfree(__attribute__((unused))char *va, Modified: trunk/openbios-devel/arch/sparc32/openprom.h ============================================================================== --- trunk/openbios-devel/arch/sparc32/openprom.h Fri Apr 8 11:03:59 2011 (r1034) +++ trunk/openbios-devel/arch/sparc32/openprom.h Fri Apr 22 02:13:53 2011 (r1035) @@ -135,7 +135,10 @@ struct linux_bootargs_v2 pv_v2bootargs; struct linux_dev_v2_funcs pv_v2devops; - int filler[15]; + /* Prom version 3 memory allocation */ + char * (*v3_memalloc)(char *va, unsigned int size, unsigned int align); + + int filler[14]; /* This one is sun4c/sun4 only. */ void (*pv_setctxt)(int ctxt, char *va, int pmeg); Modified: trunk/openbios-devel/arch/sparc32/romvec.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/romvec.c Fri Apr 8 11:03:59 2011 (r1034) +++ trunk/openbios-devel/arch/sparc32/romvec.c Fri Apr 22 02:13:53 2011 (r1035) @@ -508,6 +508,8 @@ fword("open-dev"); obp_fd_stdout = POP(); + romvec0.v3_memalloc = obp_memalloc_handler; + romvec0.v3_cpustart = obp_cpustart_handler; romvec0.v3_cpustop = obp_cpustop_handler; romvec0.v3_cpuidle = obp_cpuidle_handler; Modified: trunk/openbios-devel/arch/sparc32/romvec.h ============================================================================== --- trunk/openbios-devel/arch/sparc32/romvec.h Fri Apr 8 11:03:59 2011 (r1034) +++ trunk/openbios-devel/arch/sparc32/romvec.h Fri Apr 22 02:13:53 2011 (r1035) @@ -74,3 +74,5 @@ __attribute__((unused)) int len); const char *obp_nextprop(int node, const char *name); const char *obp_nextprop_handler(int node, const char *name); +char *obp_memalloc(char *va, unsigned int size, unsigned int align); +char *obp_memalloc_handler(char *va, unsigned int size, unsigned int align); Modified: trunk/openbios-devel/arch/sparc32/tree.fs ============================================================================== --- trunk/openbios-devel/arch/sparc32/tree.fs Fri Apr 8 11:03:59 2011 (r1034) +++ trunk/openbios-devel/arch/sparc32/tree.fs Fri Apr 22 02:13:53 2011 (r1035) @@ -125,3 +125,6 @@ " /options" find-device " disk" encode-string " boot-from" property + +" /openprom" find-device + 0 0 " aligned-allocator" property

1 0

Solaris 8 - fun with CPUs :)
by Mark Cave-Ayland 21 Apr '11

21 Apr '11

Hi all, With the previous commit in place, we now get here trying to boot my Solaris 8 ISO image under OpenBIOS: Configuration device id QEMU version 1 machine id 32 CPUs: 1 x FMI,MB86904 UUID: 00000000-0000-0000-0000-000000000000 Welcome to OpenBIOS v1.0 built on Apr 5 2011 08:40 Type 'help' for detailed information 0 > boot cdrom:d -v Not a bootable ELF image Loading a.out image... Loaded 7680 bytes entry point is 0x4000 bootpath: /iommu/sbus/espdma/esp/sd@2,0:d Jumping to entry point 00004000 for type 00000005... switching to new context: Size: 259040+54154+47486 Bytes SunOS Release 5.8 Version Generic_108528-09 32-bit Copyright 1983-2001 Sun Microsystems, Inc. All rights reserved. Ethernet address = 52:54:0:12:34:56 Using default device instance data vac: enabled in write through mode mem = 131072K (0x8000000) avail mem = 110419968 root nexus = SUNW,SPARCstation-5 iommu0 at root: obio 0x10000000 sbus0 at iommu0: obio 0x10001000 dma0 at sbus0: SBus slot 5 0x8400000 dma0 is /iommu@0,10000000/sbus@0,10001000/espdma@5,8400000 /iommu@0,10000000/sbus@0,10001000/espdma@5,8400000/esp@5,8800000 (esp0): esp-options=0x46 esp0 at dma0: SBus slot 5 0x8800000 sparc ipl 4 esp0 is /iommu@0,10000000/sbus@0,10001000/espdma@5,8400000/esp@5,8800000 sd2 at esp0: target 2 lun 0 sd2 is /iommu@0,10000000/sbus@0,10001000/espdma@5,8400000/esp@5,8800000/sd@2,0 root on /iommu@0,10000000/sbus@0,10001000/espdma@5,8400000/esp@5,8800000/sd@2,0:b fstype ufs obio0 at root obio0 at obio0: obio 0x100000, sparc ipl 12 zs0 is /obio/zs@0,100000 obio1 at obio0: obio 0x0, sparc ipl 12 zs1 is /obio/zs@0,0 (here we freeze) According to Artyom's OBP output, the next line displayed should identify the CPU but we don't ever seem to get there. Looking at various symbols within the kernel, it appears as if we spend a short time in some kind of CPU speed detection routine (a loop of several seconds with lots of get_hrtime* type calls) before bailing out. Alas at the moment, kadb doesn't work which means since these calls are coming from a module, I don't have much in the symbol names to work with. Talking of kadb, if I try and invoke it at the moment, I get this: Configuration device id QEMU version 1 machine id 32 CPUs: 1 x FMI,MB86904 UUID: 00000000-0000-0000-0000-000000000000 Welcome to OpenBIOS v1.0 built on Apr 5 2011 08:40 Type 'help' for detailed information 0 > boot cdrom:d kadb -kdv Not a bootable ELF image Loading a.out image... Loaded 7680 bytes entry point is 0x4000 bootpath: /iommu/sbus/espdma/esp/sd@2,0:d Jumping to entry point 00004000 for type 00000005... switching to new context: Size: 119204+222573+28987 Bytes kadb: kadb: kernel/unix Size: 259040+54154+47486 Bytes /platform/SUNW,SPARCstation-5/kernel/unix loaded - 0x95000 bytes used kadb[0]: :c Begin traceback... sp = 12f9e0 Called from fbd01700, fp=12fa50, args=9 f0086444 f0086438 0 f0258f2c 0 Called from f00859e0, fp=12fad8, args=f0258fc0 44 12fbf8 0 f0258f2c f0258f70 Called from f0082518, fp=12fb38, args=f0258fc0 0 44 0 0 fbd039e4 Called from f0081c48, fp=12fb98, args=12fbf8 f0258de8 12fbf8 fbd58800 f0040000 f0240000 Called from f00819c0, fp=12fff8, args=130168 f0258f70 f0258ed8 f0258ed0 2 130168 Called from f007ff0c, fp=130058, args=f0258c00 f0258c00 fbd54860 130168 f0258d08 f End traceback... fault and calling cmd: trap 9 sp 12f9e0 pc f0086444 npc f0086438 stopped at: kadb[0]: I think trap #9 is "data access error" but it only occurs when booting the kernel with kadb. Looks like this will need a bit more investigation. ATB, Mark. -- Mark Cave-Ayland - Senior Technical Architect PostgreSQL - PostGIS Sirius Corporation plc - control through freedom http://www.siriusit.co.uk t: +44 870 608 0063 Sirius Labs: http://www.siriusit.co.uk/labs

2 7

[PATCH] Implement new v3_memalloc romvec interface for allocating aligned memory.
by Mark Cave-Ayland 20 Apr '11

20 Apr '11

When attempting to load kadb from a Solaris 8 CD at boot, it seems that in order for kadb to allocate enough memory to load the kernel (and its modules) the /openprom/aligned-allocator property must be present with length zero. This has the additional side-effect that OpenBIOS memory allocations are redirected to a new romvec offset when this property is detected, which appears to have a similar interface to obp_dumb_memalloc() but with an extra alignment parameter. Hence we include a simple implementation which seems to be enough to be able to get kadb to load and attach to the kernel. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> --- openbios-devel/arch/sparc32/call-romvec.S | 1 + openbios-devel/arch/sparc32/lib.c | 28 +++++++++++++++++----------- openbios-devel/arch/sparc32/openprom.h | 5 ++++- openbios-devel/arch/sparc32/romvec.c | 2 ++ openbios-devel/arch/sparc32/romvec.h | 2 ++ openbios-devel/arch/sparc32/tree.fs | 3 +++ 6 files changed, 29 insertions(+), 12 deletions(-) diff --git a/openbios-devel/arch/sparc32/call-romvec.S b/openbios-devel/arch/sparc32/call-romvec.S index 1e8f754..dff730e 100644 --- a/openbios-devel/arch/sparc32/call-romvec.S +++ b/openbios-devel/arch/sparc32/call-romvec.S @@ -89,4 +89,5 @@ ROMVEC_HANDLER(obp_proplen) ROMVEC_HANDLER(obp_getprop) ROMVEC_HANDLER(obp_setprop) ROMVEC_HANDLER(obp_nextprop) +ROMVEC_HANDLER(obp_memalloc) diff --git a/openbios-devel/arch/sparc32/lib.c b/openbios-devel/arch/sparc32/lib.c index 01fa570..020f781 100644 --- a/openbios-devel/arch/sparc32/lib.c +++ b/openbios-devel/arch/sparc32/lib.c @@ -347,10 +347,25 @@ void ofmem_arch_early_map_pages(phys_addr_t phys, ucell virt, ucell size, ucell map_pages(phys, virt, size, mode); } -char *obp_dumb_memalloc(char *va, unsigned int size) +char *obp_memalloc(char *va, unsigned int size, unsigned int align) { phys_addr_t phys; ucell virt; + + /* Claim physical memory */ + phys = ofmem_claim_phys(-1, size, align); + + /* Claim virtual memory */ + virt = ofmem_claim_virt(pointer2cell(va), size, 0); + + /* Map the memory */ + ofmem_map(phys, virt, size, ofmem_arch_default_translation_mode(phys)); + + return cell2pointer(virt); +} + +char *obp_dumb_memalloc(char *va, unsigned int size) +{ unsigned long align; int i; @@ -371,16 +386,7 @@ char *obp_dumb_memalloc(char *va, unsigned int size) align++; } - /* Claim physical memory */ - phys = ofmem_claim_phys(-1, size, align); - - /* Claim virtual memory */ - virt = ofmem_claim_virt(pointer2cell(va), size, 0); - - /* Map the memory */ - ofmem_map(phys, virt, size, ofmem_arch_default_translation_mode(phys)); - - return cell2pointer(virt); + return obp_memalloc(va, size, align); } void obp_dumb_memfree(__attribute__((unused))char *va, diff --git a/openbios-devel/arch/sparc32/openprom.h b/openbios-devel/arch/sparc32/openprom.h index 0a2074b..0311964 100644 --- a/openbios-devel/arch/sparc32/openprom.h +++ b/openbios-devel/arch/sparc32/openprom.h @@ -135,7 +135,10 @@ struct linux_romvec { struct linux_bootargs_v2 pv_v2bootargs; struct linux_dev_v2_funcs pv_v2devops; - int filler[15]; + /* Prom version 3 memory allocation */ + char * (*v3_memalloc)(char *va, unsigned int size, unsigned int align); + + int filler[14]; /* This one is sun4c/sun4 only. */ void (*pv_setctxt)(int ctxt, char *va, int pmeg); diff --git a/openbios-devel/arch/sparc32/romvec.c b/openbios-devel/arch/sparc32/romvec.c index 843b9f4..2e154c1 100644 --- a/openbios-devel/arch/sparc32/romvec.c +++ b/openbios-devel/arch/sparc32/romvec.c @@ -508,6 +508,8 @@ init_openprom(void) fword("open-dev"); obp_fd_stdout = POP(); + romvec0.v3_memalloc = obp_memalloc_handler; + romvec0.v3_cpustart = obp_cpustart_handler; romvec0.v3_cpustop = obp_cpustop_handler; romvec0.v3_cpuidle = obp_cpuidle_handler; diff --git a/openbios-devel/arch/sparc32/romvec.h b/openbios-devel/arch/sparc32/romvec.h index d5103d1..a16115d 100644 --- a/openbios-devel/arch/sparc32/romvec.h +++ b/openbios-devel/arch/sparc32/romvec.h @@ -74,3 +74,5 @@ int obp_setprop_handler(__attribute__((unused)) int node, __attribute__((unused)) int len); const char *obp_nextprop(int node, const char *name); const char *obp_nextprop_handler(int node, const char *name); +char *obp_memalloc(char *va, unsigned int size, unsigned int align); +char *obp_memalloc_handler(char *va, unsigned int size, unsigned int align); diff --git a/openbios-devel/arch/sparc32/tree.fs b/openbios-devel/arch/sparc32/tree.fs index c0b08bd..f9a0406 100644 --- a/openbios-devel/arch/sparc32/tree.fs +++ b/openbios-devel/arch/sparc32/tree.fs @@ -125,3 +125,6 @@ finish-device " /options" find-device " disk" encode-string " boot-from" property + +" /openprom" find-device + 0 0 " aligned-allocator" property -- 1.7.2.5

2 1

[PATCH] Implement new pv_align_mem_alloc romvec interface for allocating aligned memory.
by Mark Cave-Ayland 20 Apr '11

20 Apr '11

When attempting to load kadb from a Solaris 8 CD at boot, it seems that in order for kadb to allocate enough memory to load the kernel (and its modules) the /openprom/aligned-allocator property must be present with length zero. This has the additional side-effect that OpenBIOS memory allocations are redirected to a new romvec offset when this property is detected, which appears to have a similar interface to obp_dumb_memalloc() but with an extra alignment parameter. Hence we include a simple implementation which seems to be enough to be able to get kadb to load and attach to the kernel. --- openbios-devel/arch/sparc32/call-romvec.S | 1 + openbios-devel/arch/sparc32/lib.c | 28 +++++++++++++++++----------- openbios-devel/arch/sparc32/openprom.h | 5 ++++- openbios-devel/arch/sparc32/romvec.c | 2 ++ openbios-devel/arch/sparc32/romvec.h | 2 ++ openbios-devel/arch/sparc32/tree.fs | 3 +++ 6 files changed, 29 insertions(+), 12 deletions(-) diff --git a/openbios-devel/arch/sparc32/call-romvec.S b/openbios-devel/arch/sparc32/call-romvec.S index 1e8f754..2b2dfe0 100644 --- a/openbios-devel/arch/sparc32/call-romvec.S +++ b/openbios-devel/arch/sparc32/call-romvec.S @@ -89,4 +89,5 @@ ROMVEC_HANDLER(obp_proplen) ROMVEC_HANDLER(obp_getprop) ROMVEC_HANDLER(obp_setprop) ROMVEC_HANDLER(obp_nextprop) +ROMVEC_HANDLER(obp_align_memalloc) diff --git a/openbios-devel/arch/sparc32/lib.c b/openbios-devel/arch/sparc32/lib.c index 01fa570..b975fd4 100644 --- a/openbios-devel/arch/sparc32/lib.c +++ b/openbios-devel/arch/sparc32/lib.c @@ -347,10 +347,25 @@ void ofmem_arch_early_map_pages(phys_addr_t phys, ucell virt, ucell size, ucell map_pages(phys, virt, size, mode); } -char *obp_dumb_memalloc(char *va, unsigned int size) +char *obp_align_memalloc(char *va, unsigned int size, unsigned int align) { phys_addr_t phys; ucell virt; + + /* Claim physical memory */ + phys = ofmem_claim_phys(-1, size, align); + + /* Claim virtual memory */ + virt = ofmem_claim_virt(pointer2cell(va), size, 0); + + /* Map the memory */ + ofmem_map(phys, virt, size, ofmem_arch_default_translation_mode(phys)); + + return cell2pointer(virt); +} + +char *obp_dumb_memalloc(char *va, unsigned int size) +{ unsigned long align; int i; @@ -371,16 +386,7 @@ char *obp_dumb_memalloc(char *va, unsigned int size) align++; } - /* Claim physical memory */ - phys = ofmem_claim_phys(-1, size, align); - - /* Claim virtual memory */ - virt = ofmem_claim_virt(pointer2cell(va), size, 0); - - /* Map the memory */ - ofmem_map(phys, virt, size, ofmem_arch_default_translation_mode(phys)); - - return cell2pointer(virt); + return obp_align_memalloc(va, size, align); } void obp_dumb_memfree(__attribute__((unused))char *va, diff --git a/openbios-devel/arch/sparc32/openprom.h b/openbios-devel/arch/sparc32/openprom.h index 0a2074b..5f05014 100644 --- a/openbios-devel/arch/sparc32/openprom.h +++ b/openbios-devel/arch/sparc32/openprom.h @@ -135,7 +135,10 @@ struct linux_romvec { struct linux_bootargs_v2 pv_v2bootargs; struct linux_dev_v2_funcs pv_v2devops; - int filler[15]; + /* Allocate memory to specified alignment */ + char * (*pv_align_mem_alloc)(char *va, unsigned int size, unsigned int align); + + int filler[11]; /* This one is sun4c/sun4 only. */ void (*pv_setctxt)(int ctxt, char *va, int pmeg); diff --git a/openbios-devel/arch/sparc32/romvec.c b/openbios-devel/arch/sparc32/romvec.c index 843b9f4..463181d 100644 --- a/openbios-devel/arch/sparc32/romvec.c +++ b/openbios-devel/arch/sparc32/romvec.c @@ -508,6 +508,8 @@ init_openprom(void) fword("open-dev"); obp_fd_stdout = POP(); + romvec0.pv_align_mem_alloc = obp_align_memalloc_handler; + romvec0.v3_cpustart = obp_cpustart_handler; romvec0.v3_cpustop = obp_cpustop_handler; romvec0.v3_cpuidle = obp_cpuidle_handler; diff --git a/openbios-devel/arch/sparc32/romvec.h b/openbios-devel/arch/sparc32/romvec.h index d5103d1..816109c 100644 --- a/openbios-devel/arch/sparc32/romvec.h +++ b/openbios-devel/arch/sparc32/romvec.h @@ -74,3 +74,5 @@ int obp_setprop_handler(__attribute__((unused)) int node, __attribute__((unused)) int len); const char *obp_nextprop(int node, const char *name); const char *obp_nextprop_handler(int node, const char *name); +char *obp_align_memalloc(char *va, unsigned int size, unsigned int align); +char *obp_align_memalloc_handler(char *va, unsigned int size, unsigned int align); diff --git a/openbios-devel/arch/sparc32/tree.fs b/openbios-devel/arch/sparc32/tree.fs index c0b08bd..f9a0406 100644 --- a/openbios-devel/arch/sparc32/tree.fs +++ b/openbios-devel/arch/sparc32/tree.fs @@ -125,3 +125,6 @@ finish-device " /options" find-device " disk" encode-string " boot-from" property + +" /openprom" find-device + 0 0 " aligned-allocator" property -- 1.7.2.5

2 2

[commit] r1034 - trunk/openbios-devel/arch/sparc32
by repository service 08 Apr '11

08 Apr '11

Author: mcayland Date: Fri Apr 8 11:03:59 2011 New Revision: 1034 URL: http://tracker.coreboot.org/trac/openbios/changeset/1034 Log: Enforce physical alignment based upon size for the SPARC32 romvec obp_dumb_memalloc() function. It appears that Solaris assumes that the resulting memory is physically aligned based upon the value of size. Make sure we also respect this alignment, so that memory allocated using this interface can be correctly used for the Solaris IOMMU page tables. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc32/lib.c Modified: trunk/openbios-devel/arch/sparc32/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/lib.c Fri Feb 18 21:26:57 2011 (r1033) +++ trunk/openbios-devel/arch/sparc32/lib.c Fri Apr 8 11:03:59 2011 (r1034) @@ -351,9 +351,28 @@ { phys_addr_t phys; ucell virt; + unsigned long align; + int i; + + /* Solaris seems to assume that the returned value is physically aligned to size. For + example, not having this here causes the Solaris 8 kernel to fault because the + IOMMU page table base address is calculated incorrectly. */ + + /* Enforce a minimum alignment of CONFIG_OFMEM_MALLOC_ALIGN, and choose an alignment + which is the next power of 2 higher than the specified size */ + align = size; + if (align <= CONFIG_OFMEM_MALLOC_ALIGN) { + align = CONFIG_OFMEM_MALLOC_ALIGN; + } else { + align--; + for (i = 1; i < sizeof(unsigned long) * 8; i<<=1) { + align |= align >> i; + } + align++; + } /* Claim physical memory */ - phys = ofmem_claim_phys(-1, size, CONFIG_OFMEM_MALLOC_ALIGN); + phys = ofmem_claim_phys(-1, size, align); /* Claim virtual memory */ virt = ofmem_claim_virt(pointer2cell(va), size, 0);

1 0

[PATCH] Enforce physical alignment based upon size for the SPARC32 romvec obp_dumb_memalloc() function.
by Mark Cave-Ayland 07 Apr '11

07 Apr '11

It appears that Solaris assumes that the resulting memory is physically aligned based upon the value of size. Make sure we also respect this alignment, so that memory allocated using this interface can be correctly used for the Solaris IOMMU page tables. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> --- openbios-devel/arch/sparc32/lib.c | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/openbios-devel/arch/sparc32/lib.c b/openbios-devel/arch/sparc32/lib.c index 5b41dff..01fa570 100644 --- a/openbios-devel/arch/sparc32/lib.c +++ b/openbios-devel/arch/sparc32/lib.c @@ -351,9 +351,28 @@ char *obp_dumb_memalloc(char *va, unsigned int size) { phys_addr_t phys; ucell virt; + unsigned long align; + int i; + + /* Solaris seems to assume that the returned value is physically aligned to size. For + example, not having this here causes the Solaris 8 kernel to fault because the + IOMMU page table base address is calculated incorrectly. */ + + /* Enforce a minimum alignment of CONFIG_OFMEM_MALLOC_ALIGN, and choose an alignment + which is the next power of 2 higher than the specified size */ + align = size; + if (align <= CONFIG_OFMEM_MALLOC_ALIGN) { + align = CONFIG_OFMEM_MALLOC_ALIGN; + } else { + align--; + for (i = 1; i < sizeof(unsigned long) * 8; i<<=1) { + align |= align >> i; + } + align++; + } /* Claim physical memory */ - phys = ofmem_claim_phys(-1, size, CONFIG_OFMEM_MALLOC_ALIGN); + phys = ofmem_claim_phys(-1, size, align); /* Claim virtual memory */ virt = ofmem_claim_virt(pointer2cell(va), size, 0); -- 1.7.2.5

2 1

[PATCH] Enforce physical alignment based upon size for the SPARC32 romvec obp_dumb_memalloc() function.
by Mark Cave-Ayland 06 Apr '11

06 Apr '11

It appears that Solaris assumes that the resulting memory is physically aligned based upon the value of size. Make sure we also respect this alignment, so that memory allocated using this interface can be correctly used for the Solaris IOMMU page tables. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> --- openbios-devel/arch/sparc32/lib.c | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/openbios-devel/arch/sparc32/lib.c b/openbios-devel/arch/sparc32/lib.c index 5b41dff..59cd23b 100644 --- a/openbios-devel/arch/sparc32/lib.c +++ b/openbios-devel/arch/sparc32/lib.c @@ -351,9 +351,27 @@ char *obp_dumb_memalloc(char *va, unsigned int size) { phys_addr_t phys; ucell virt; + unsigned int align, i; + + /* Solaris seems to assume that the returned value is physically aligned to size. For + example, not having this here causes the Solaris 8 kernel to fault because the + IOMMU page table base address is calculated incorrectly. */ + + /* Enforce a minimum alignment of CONFIG_OFMEM_MALLOC_ALIGN, and choose an alignment + which is the next power of 2 higher than the specified size */ + align = size; + if (align < CONFIG_OFMEM_MALLOC_ALIGN) { + align = CONFIG_OFMEM_MALLOC_ALIGN; + } else { + align--; + for (i = 1; i < sizeof(unsigned int) * 8; i<<=1) { + align = align | align >> i; + } + align++; + } /* Claim physical memory */ - phys = ofmem_claim_phys(-1, size, CONFIG_OFMEM_MALLOC_ALIGN); + phys = ofmem_claim_phys(-1, size, align); /* Claim virtual memory */ virt = ofmem_claim_virt(pointer2cell(va), size, 0); -- 1.7.2.5 -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.

2 2

[PATCH] Enforce physical alignment based upon size for the SPARC32 romvec obp_dumb_memalloc() function.
by Mark Cave-Ayland 05 Apr '11

05 Apr '11

It appears that Solaris assumes that the resulting memory is physically aligned based upon the value of size. Make sure we also respect this alignment, so that memory allocated using this interface can be correctly used for the Solaris IOMMU page tables. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> --- openbios-devel/arch/sparc32/lib.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/openbios-devel/arch/sparc32/lib.c b/openbios-devel/arch/sparc32/lib.c index 5b41dff..0219a19 100644 --- a/openbios-devel/arch/sparc32/lib.c +++ b/openbios-devel/arch/sparc32/lib.c @@ -351,9 +351,19 @@ char *obp_dumb_memalloc(char *va, unsigned int size) { phys_addr_t phys; ucell virt; - + unsigned int align; + + /* Solaris seems to assume that the returned value is physically aligned to size. For + example, not having this here causes the Solaris 8 kernel to fault because the + IOMMU page table base address is calculated incorrectly. */ + + /* Enforce a minimum alignment of CONFIG_OFMEM_MALLOC_ALIGN, and also ensure that + only the MSB is set for the alignment value. This prevents spurious + "bad alignment" warnings from OFMEM when running with CONFIG_DEBUG_OFMEM. */ + align = (size + CONFIG_OFMEM_MALLOC_ALIGN - 1) & ~(size - 1); + /* Claim physical memory */ - phys = ofmem_claim_phys(-1, size, CONFIG_OFMEM_MALLOC_ALIGN); + phys = ofmem_claim_phys(-1, size, align); /* Claim virtual memory */ virt = ofmem_claim_virt(pointer2cell(va), size, 0); -- 1.7.2.5 -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.

2 2

Solaris 8: ESP device enumeration issue
by Mark Cave-Ayland 04 Apr '11

04 Apr '11

Hi all, So with the previous patch to change the initial timer values applied to SVN trunk, we now get much further on a Solaris 8 boot: Configuration device id QEMU version 1 machine id 32 CPUs: 1 x FMI,MB86904 UUID: 00000000-0000-0000-0000-000000000000 Welcome to OpenBIOS v1.0 built on Feb 17 2011 14:56 Type 'help' for detailed information 0 > boot cdrom:d -v Not a bootable ELF image Loading a.out image... Loaded 7680 bytes entry point is 0x4000 bootpath: /iommu/sbus/espdma/esp/sd@2,0:d Jumping to entry point 00004000 for type 00000005... switching to new context: Size: 259040+54154+47486 Bytes SunOS Release 5.8 Version Generic_108528-09 32-bit Copyright 1983-2001 Sun Microsystems, Inc. All rights reserved. Ethernet address = 52:54:0:12:34:56 Using default device instance data vac: enabled in write through mode mem = 131072K (0x8000000) avail mem = 110419968 root nexus = SUNW,SPARCstation-5 iommu0 at root: obio 0x10000000 sbus0 at iommu0: obio 0x10001000 dma0 at sbus0: SBus slot 5 0x8400000 dma0 is /iommu@0,10000000/sbus@0,10001000/espdma@5,8400000 /iommu@0,10000000/sbus@0,10001000/espdma@5,8400000/esp@5,8800000 (esp0): esp-options=0x46 esp0 at dma0: SBus slot 5 0x8800000 sparc ipl 4 esp0 is /iommu@0,10000000/sbus@0,10001000/espdma@5,8400000/esp@5,8800000 qemu: fatal: Trap 0x29 while interrupts disabled, Error state pc: f004127c npc: f0041280 General Registers: %g0-7: 00000000 f02441a0 04400fc1 00007000 f5af4e40 f0243b88 00000000 f0244020 Current Register Window: %o0-7: ffff8000 00008000 00000f00 044000c0 f5948688 ffebc000 fbe3a4b8 f0041be4 %l0-7: 04400fc0 f0041c78 f0041c7c 00000001 0000010f 00000001 0000002a fbe39f78 %i0-7: ffff8000 00008000 00000f00 044000c1 00000002 ffebc000 fbe3a020 f0041be4 Floating Point Registers: %f00: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 %f04: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 %f08: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 %f12: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 %f16: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 %f20: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 %f24: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 %f28: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 psr: 04000fc0 (icc: ---- SPE: SP-) wim: 00000001 fsr: 00080000 y: 00000000 Aborted From Artyom's OBP output, we can see that the next few lines that should appear on the console look like this: sd2 at esp0: target 2 lun 0 sd2 is /iommu at 0,10000000/sbus at 0,10001000/espdma at 5,8400000/esp at 5,8800000/sd at 2,0 root on /iommu at 0,10000000/sbus at 0,10001000/espdma at 5,8400000/esp at 5,8800000/sd at 2,0:b Therefore the crash is being caused by Solaris either trying to access the esp device or doing some kind of enumeration on the ESP bus. ATB, Mark. -- Mark Cave-Ayland - Senior Technical Architect PostgreSQL - PostGIS Sirius Corporation plc - control through freedom http://www.siriusit.co.uk t: +44 870 608 0063 Sirius Labs: http://www.siriusit.co.uk/labs

3 16

[PATCH] Fix PowerPC build
by Aurelien Jarno 19 Feb '11

19 Feb '11

Given openbios overrides <asm/types.h> with its own version, it should provides at least the same types for the included kernel headers. This fixes the following build failure: | HOSTCC host/kernel/bootstrap.o | In file included from /usr/include/asm/ptrace.h:28, | from /usr/include/asm/sigcontext.h:12, | from /usr/include/bits/sigcontext.h:29, | from /usr/include/signal.h:340, | from ../kernel/bootstrap.c:14: | /usr/include/linux/types.h:27: error: expected '=', ',', ';', 'asm' or '__attribute__' before '__le16' | /usr/include/linux/types.h:28: error: expected '=', ',', ';', 'asm' or '__attribute__' before '__be16' | /usr/include/linux/types.h:29: error: expected '=', ',', ';', 'asm' or '__attribute__' before '__le32' | /usr/include/linux/types.h:30: error: expected '=', ',', ';', 'asm' or '__attribute__' before '__be32' | /usr/include/linux/types.h:31: error: expected '=', ',', ';', 'asm' or '__attribute__' before '__le64' | /usr/include/linux/types.h:32: error: expected '=', ',', ';', 'asm' or '__attribute__' before '__be64' | /usr/include/linux/types.h:34: error: expected '=', ',', ';', 'asm' or '__attribute__' before '__sum16' | /usr/include/linux/types.h:35: error: expected '=', ',', ';', 'asm' or '__attribute__' before '__wsum' | In file included from /usr/include/asm/sigcontext.h:12, | from /usr/include/bits/sigcontext.h:29, | from /usr/include/signal.h:340, | from ../kernel/bootstrap.c:14: | /usr/include/asm/ptrace.h:201: error: expected specifier-qualifier-list before '__u32' | In file included from /usr/include/asm/sigcontext.h:12, | from /usr/include/bits/sigcontext.h:29, | from /usr/include/signal.h:340, | from ../kernel/bootstrap.c:14: | /usr/include/asm/ptrace.h:223: error: expected specifier-qualifier-list before '__u32' | make[1]: *** [host/kernel/bootstrap.o] Error 1 Signed-off-by: Aurelien Jarno <aurelien(a)aurel32.net> --- a/include/arch/ppc/types.h +++ b/include/arch/ppc/types.h @@ -75,4 +75,10 @@ typedef short s16; typedef int s32; typedef long long s64; +/* Needed by kernel includes */ +typedef u8 __u8; +typedef u16 __u16; +typedef u32 __u32; +typedef u64 __u64; + #endif -- Aurelien Jarno GPG: 1024D/F1BCDB73 aurelien(a)aurel32.net http://www.aurel32.net

3 5

openfirmware boot partition layout
by Dinar Valeev 18 Feb '11

18 Feb '11

Hi, I'm playing with kvm on powerpc (I have LPAR'ed IBM Power5 machine). I have a couple of disk images which are working perfectly. (I've tested it by deploying it using VIO server with usual dd command directly to LPAR disk) But when I'm trying to attach same image as qemu (with KVM enabled) disk. VM won't boot. It just stuck on openbios banner. I have another image with old mac partition table (which is working under qemu) So I have actually two questions: 1) Is booting from PReP partition (type 0x41) is supported? (PReP just consists raw copy of yaboot binary) 2) When VM have LVM root then it required to have FAT partition (type 0x06) with kernel, initrd, yaboot and its config. Does this scenario supported as well? Here is usual partition setups I have: non lvm setup: Number Start End Size Type File system Flags 1 32.3kB 8225kB 8193kB primary boot, , , , , , , , , type=41, prep, 2 8225kB 897MB 888MB primary ext3 , , , , , , , , , type=83, , lvm setup: Number Start End Size Type File system Flags 1 32.3kB 49.4MB 49.3MB primary fat16 boot, , , , , , , , , type=06, , 2 49.4MB 979MB 929MB primary , , , , , lvm, , , , type=8e, , I'll glad to provide additional information or participate in testing in the future. Thanks in advance, Dinar

4 7

[commit] r1033 - trunk/openbios-devel/drivers
by repository service 18 Feb '11

18 Feb '11

Author: mcayland Date: Fri Feb 18 21:26:57 2011 New Revision: 1033 URL: http://tracker.coreboot.org/trac/openbios/changeset/1033 Log: Fix level 14 and level 10 timers under Solaris 8 on SPARC32. During boot, if the level 14 timer limit is not set then the Solaris kernel panics with a division by zero error. Fix this by setting it to the default value as documented in obio.h. Also if the level 10 timer is not set with a limit of 0, the Solaris kernel constantly outputs "spurious interrupt at processor level 10" messages during boot. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/drivers/obio.c Modified: trunk/openbios-devel/drivers/obio.c ============================================================================== --- trunk/openbios-devel/drivers/obio.c Thu Feb 17 21:00:49 2011 (r1032) +++ trunk/openbios-devel/drivers/obio.c Fri Feb 18 21:26:57 2011 (r1033) @@ -296,8 +296,8 @@ counter_regs = (struct sun4m_timer_regs *)ofmem_map_io(base + (uint64_t)offset, sizeof(*counter_regs)); counter_regs->cfg = 0xffffffff; - counter_regs->l10_timer_limit = (((1000000/100) + 1) << 10); - counter_regs->cpu_timers[0].l14_timer_limit = 0; + counter_regs->l10_timer_limit = 0; + counter_regs->cpu_timers[0].l14_timer_limit = 0x9c4000; /* see comment in obio.h */ counter_regs->cpu_timers[0].cntrl = 1; for (i = 0; i < SUN4M_NCPU; i++) {

1 0

[PATCH] Fix level 14 and level 10 timers under Solaris 8 on SPARC32.
by mark.cave-ayland＠siriusit.co.uk 18 Feb '11

18 Feb '11

From: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> During boot, if the level 14 timer limit is not set then the Solaris kernel panics with a division by zero error. Fix this by setting it to the default value as documented in obio.h. Also if the level 10 timer is not set with a limit of 0, the Solaris kernel constantly outputs "spurious interrupt at processor level 10" messages during boot. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> --- openbios-devel/drivers/obio.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openbios-devel/drivers/obio.c b/openbios-devel/drivers/obio.c index 2153c44..3adf9ac 100644 --- a/openbios-devel/drivers/obio.c +++ b/openbios-devel/drivers/obio.c @@ -296,8 +296,8 @@ ob_counter_init(uint64_t base, unsigned long offset) counter_regs = (struct sun4m_timer_regs *)ofmem_map_io(base + (uint64_t)offset, sizeof(*counter_regs)); counter_regs->cfg = 0xffffffff; - counter_regs->l10_timer_limit = (((1000000/100) + 1) << 10); - counter_regs->cpu_timers[0].l14_timer_limit = 0; + counter_regs->l10_timer_limit = 0; + counter_regs->cpu_timers[0].l14_timer_limit = 0x9c4000; /* see comment in obio.h */ counter_regs->cpu_timers[0].cntrl = 1; for (i = 0; i < SUN4M_NCPU; i++) { -- 1.7.2.3

3 2

[PATCH] ESP : Fix SCSI READ command length
by Olivier DANET 17 Feb '11

17 Feb '11

Signed-off-by: Olivier Danet <odanet(a)caramail.com> --- diff -rup a/drivers/esp.c b/drivers/esp.c --- a/drivers/esp.c 2011-01-27 15:11:52.000000000 +0100 +++ b/drivers/esp.c 2011-01-27 15:13:34.000000000 +0100 @@ -147,7 +147,7 @@ ob_sd_read_sector(esp_private_t *esp, sd sd->id, offset); // Setup command = Read(10) - memset(esp->buffer, 0, 10); + memset(esp->buffer, 0, 11); esp->buffer[0] = 0x80; esp->buffer[1] = READ_10; @@ -159,7 +159,7 @@ ob_sd_read_sector(esp_private_t *esp, sd esp->buffer[8] = 0; esp->buffer[9] = 1; - if (do_command(esp, sd, 10, sd->bs)) + if (do_command(esp, sd, 11, sd->bs)) return 0; return 0;

4 5

[commit] r1032 - trunk/openbios-devel/drivers
by repository service 17 Feb '11

17 Feb '11

Author: blueswirl Date: Thu Feb 17 21:00:49 2011 New Revision: 1032 URL: http://tracker.coreboot.org/trac/openbios/changeset/1032 Log: ESP : Fix SCSI READ command length Signed-off-by: Olivier Danet <odanet(a)caramail.com> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/drivers/esp.c Modified: trunk/openbios-devel/drivers/esp.c ============================================================================== --- trunk/openbios-devel/drivers/esp.c Sun Feb 13 23:30:14 2011 (r1031) +++ trunk/openbios-devel/drivers/esp.c Thu Feb 17 21:00:49 2011 (r1032) @@ -147,7 +147,7 @@ sd->id, offset); // Setup command = Read(10) - memset(esp->buffer, 0, 10); + memset(esp->buffer, 0, 11); esp->buffer[0] = 0x80; esp->buffer[1] = READ_10; @@ -159,7 +159,7 @@ esp->buffer[8] = 0; esp->buffer[9] = 1; - if (do_command(esp, sd, 10, sd->bs)) + if (do_command(esp, sd, 11, sd->bs)) return 0; return 0;

1 0

State of AIX
by Grieve, Shane 14 Feb '11

14 Feb '11

I have been following the AIX booting issue for a while now and was wondering if there is any progress. I have access to AIX hardware and I am happy to help test. Thanks Shane

5 11

More work on Solaris 8 SPARC32 crash
by Mark Cave-Ayland 14 Feb '11

14 Feb '11

Hi all, I've spent a bit more time today trying to figure out why this crashes under OpenBIOS and so decided to start working backwards through the -d in_asm QEMU output to try and figure out why we seem to get stuck in an infinite loop. Anyhow the short version is that I've traced the series of functions that get called just before we get stuck in the infinite loop and it looks like this: 0xf0044384: cbe_set_level 0xf0063954: splr 0xf0044268: cbe_enable 0xf0062cf0: __div64 ... invokes "ta 2" trap instruction 0xf004127c: sys_trap() 0xf0064658: vpanic () 0xf0064618: panic_trigger () 0xf005bf90: trap ... infinite loop ... The interesting part here is that the fatal trap sequence is being invoked from __div64 which makes me think it is some kind of divide by zero error. I'm not exactly sure what the cbe_* functions are doing, but a quick browse of the OpenSolaris source shows that it's related to PIL/RTC things. My current feeling is that maybe OpenBIOS isn't doing something right with PIL state somewhere, or we're reading back a zero value from either the clock (or a missing OpenBIOS property) which is causing us to die in the division in cbe_enable(). And another thing, what does cbe actually stand for? ATB, Mark. -- Mark Cave-Ayland - Senior Technical Architect PostgreSQL - PostGIS Sirius Corporation plc - control through freedom http://www.siriusit.co.uk t: +44 870 608 0063 Sirius Labs: http://www.siriusit.co.uk/labs

3 8

[commit] r1031 - in trunk/openbios-devel: include/arch/amd64 include/arch/ppc include/arch/sparc32 include/arch/sparc64 include/arch/x86 kernel
by repository service 13 Feb '11

13 Feb '11

Author: afaerber Date: Sun Feb 13 23:30:14 2011 New Revision: 1031 URL: http://tracker.coreboot.org/trac/openbios/changeset/1031 Log: Tidy cell types and format strings Always define [u]cell in terms of fixed-width POSIX types, so that their PRI* macros can be reused. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> 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/kernel/cross.h Modified: trunk/openbios-devel/include/arch/amd64/types.h ============================================================================== --- trunk/openbios-devel/include/arch/amd64/types.h Sun Feb 13 22:08:59 2011 (r1030) +++ trunk/openbios-devel/include/arch/amd64/types.h Sun Feb 13 23:30:14 2011 (r1031) @@ -24,12 +24,12 @@ /* cell based types */ -typedef long long cell; -typedef unsigned long long ucell; -typedef __int128_t dcell; +typedef int64_t cell; +typedef uint64_t ucell; +typedef __int128_t dcell; typedef __uint128_t ducell; -#define FMT_ucellx "%016llx" +#define FMT_ucellx "%016" PRIx64 typedef int64_t prom_arg_t; typedef uint64_t prom_uarg_t; Modified: trunk/openbios-devel/include/arch/ppc/types.h ============================================================================== --- trunk/openbios-devel/include/arch/ppc/types.h Sun Feb 13 22:08:59 2011 (r1030) +++ trunk/openbios-devel/include/arch/ppc/types.h Sun Feb 13 23:30:14 2011 (r1031) @@ -55,10 +55,10 @@ typedef int64_t dcell; typedef uint64_t ducell; -#define FMT_cell "%d" -#define FMT_ucell "%u" -#define FMT_ucellx "%08x" -#define FMT_ucellX "%08X" +#define FMT_cell "%" PRId32 +#define FMT_ucell "%" PRIu32 +#define FMT_ucellx "%08" PRIx32 +#define FMT_ucellX "%08" PRIX32 typedef int32_t prom_arg_t; typedef uint32_t prom_uarg_t; Modified: trunk/openbios-devel/include/arch/sparc32/types.h ============================================================================== --- trunk/openbios-devel/include/arch/sparc32/types.h Sun Feb 13 22:08:59 2011 (r1030) +++ trunk/openbios-devel/include/arch/sparc32/types.h Sun Feb 13 23:30:14 2011 (r1031) @@ -54,8 +54,8 @@ #define FMT_cell "%" PRId32 #define FMT_ucell "%" PRIu32 -#define FMT_ucellx "%08x" -#define FMT_ucellX "%08X" +#define FMT_ucellx "%08" PRIx32 +#define FMT_ucellX "%08" PRIX32 typedef int32_t prom_arg_t; typedef uint32_t prom_uarg_t; Modified: trunk/openbios-devel/include/arch/sparc64/types.h ============================================================================== --- trunk/openbios-devel/include/arch/sparc64/types.h Sun Feb 13 22:08:59 2011 (r1030) +++ trunk/openbios-devel/include/arch/sparc64/types.h Sun Feb 13 23:30:14 2011 (r1031) @@ -45,13 +45,13 @@ #define FMT_plx "%016" PRIx64 /* cell based types */ -typedef long long cell; -typedef unsigned long long ucell; +typedef int64_t cell; +typedef uint64_t ucell; -#define FMT_cell "%lld" -#define FMT_ucell "%llu" -#define FMT_ucellx "%016llx" -#define FMT_ucellX "%016llX" +#define FMT_cell "%" PRId64 +#define FMT_ucell "%" PRIu64 +#define FMT_ucellx "%016" PRIx64 +#define FMT_ucellX "%016" PRIX64 typedef int64_t prom_arg_t; typedef uint64_t prom_uarg_t; Modified: trunk/openbios-devel/include/arch/x86/types.h ============================================================================== --- trunk/openbios-devel/include/arch/x86/types.h Sun Feb 13 22:08:59 2011 (r1030) +++ trunk/openbios-devel/include/arch/x86/types.h Sun Feb 13 23:30:14 2011 (r1031) @@ -30,10 +30,10 @@ typedef int64_t dcell; typedef uint64_t ducell; -#define FMT_cell "%ld" -#define FMT_ucell "%lu" -#define FMT_ucellx "%08x" -#define FMT_ucellX "%08X" +#define FMT_cell "%" PRId32 +#define FMT_ucell "%" PRIu32 +#define FMT_ucellx "%08" PRIx32 +#define FMT_ucellX "%08" PRIX32 typedef int32_t prom_arg_t; typedef uint32_t prom_uarg_t; Modified: trunk/openbios-devel/kernel/cross.h ============================================================================== --- trunk/openbios-devel/kernel/cross.h Sun Feb 13 22:08:59 2011 (r1030) +++ trunk/openbios-devel/kernel/cross.h Sun Feb 13 23:30:14 2011 (r1031) @@ -103,11 +103,11 @@ /* bit width handling */ #if BITS==32 -#define FMT_CELL_x "x" -#define FMT_CELL_d "d" +#define FMT_CELL_x PRIx32 +#define FMT_CELL_d PRId32 #else -#define FMT_CELL_x "llx" -#define FMT_CELL_d "lld" +#define FMT_CELL_x PRIx64 +#define FMT_CELL_d PRId64 #endif #ifdef NATIVE_BITWIDTH_SMALLER_THAN_HOST_BITWIDTH

1 0

[commit] r1030 - trunk/openbios-devel/include/arch/ppc
by repository service 13 Feb '11

13 Feb '11

Author: afaerber Date: Sun Feb 13 22:08:59 2011 New Revision: 1030 URL: http://tracker.coreboot.org/trac/openbios/changeset/1030 Log: ppc: Use inttypes.h It defines the PRI* macros for the host. Cf. r1026. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/include/arch/ppc/types.h Modified: trunk/openbios-devel/include/arch/ppc/types.h ============================================================================== --- trunk/openbios-devel/include/arch/ppc/types.h Sun Feb 13 21:54:47 2011 (r1029) +++ trunk/openbios-devel/include/arch/ppc/types.h Sun Feb 13 22:08:59 2011 (r1030) @@ -12,7 +12,7 @@ #include "mconfig.h" #ifdef BOOTSTRAP -#include <stdint.h> +#include <inttypes.h> #else typedef unsigned char uint8_t; typedef unsigned short uint16_t;

1 0

[commit] r1029 - in trunk/openbios-devel: arch/ppc/qemu include/arch/ppc
by repository service 13 Feb '11

13 Feb '11

Author: afaerber Date: Sun Feb 13 21:54:47 2011 New Revision: 1029 URL: http://tracker.coreboot.org/trac/openbios/changeset/1029 Log: ppc64: Re-enable SF bit after returning from ELF binary When returning from the binary, enable Sixty-Four Bit Mode. Leave it disabled on entry, as enabling it breaks multiple guests. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/arch/ppc/qemu/start.S trunk/openbios-devel/include/arch/ppc/processor.h Modified: trunk/openbios-devel/arch/ppc/qemu/start.S ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/start.S Sun Feb 13 21:31:14 2011 (r1028) +++ trunk/openbios-devel/arch/ppc/qemu/start.S Sun Feb 13 21:54:47 2011 (r1029) @@ -494,6 +494,11 @@ MTMSRD(r0) blrl +#ifdef CONFIG_PPC64 + /* Restore SF bit */ + LOAD_REG_IMMEDIATE(r0, MSR_SF | MSR_FP | MSR_ME | MSR_DR | MSR_IR) + MTMSRD(r0) +#endif LOAD_REG_IMMEDIATE(r8, saved_stack) // restore stack pointer mr r1,r8 PPC_LL r0, (STACKFRAME_MINSIZE + PPC_LR_STKOFF)(r1) Modified: trunk/openbios-devel/include/arch/ppc/processor.h ============================================================================== --- trunk/openbios-devel/include/arch/ppc/processor.h Sun Feb 13 21:31:14 2011 (r1028) +++ trunk/openbios-devel/include/arch/ppc/processor.h Sun Feb 13 21:54:47 2011 (r1029) @@ -40,6 +40,8 @@ #ifndef MSR_VEC +#define MSR_SF (1 << 63) /* Sixty-Four Bit Mode */ + #define MSR_VEC (1<<25) /* 6: Enable AltiVec */ #define MSR_POW (1<<18) /* 13: Enable Power Management */ #define MSR_TGPR (1<<17) /* 14: TLB Update registers in use */

1 0

[commit] r1028 - in trunk/openbios-devel: include/arch/amd64 include/arch/ia64 include/arch/ppc include/arch/sparc32 include/arch/sparc64 include/arch/x86 libopenbios
by repository service 13 Feb '11

13 Feb '11

Author: afaerber Date: Sun Feb 13 21:31:14 2011 New Revision: 1028 URL: http://tracker.coreboot.org/trac/openbios/changeset/1028 Log: libopenbios: Adapt CIF handling for ppc64 On ppc64, currently neither long nor pointers can be used for the client interface. Introduce new types prom_[u]arg_t as abstraction and add helpers get_service() and arg2pointer() as well as format strings. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/include/arch/amd64/types.h trunk/openbios-devel/include/arch/ia64/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/libopenbios/client.c Modified: trunk/openbios-devel/include/arch/amd64/types.h ============================================================================== --- trunk/openbios-devel/include/arch/amd64/types.h Sun Feb 13 20:56:29 2011 (r1027) +++ trunk/openbios-devel/include/arch/amd64/types.h Sun Feb 13 21:31:14 2011 (r1028) @@ -31,6 +31,16 @@ #define FMT_ucellx "%016llx" +typedef int64_t prom_arg_t; +typedef uint64_t prom_uarg_t; + +#define PRIdPROMARG PRId64 +#define PRIuPROMARG PRIu64 +#define PRIxPROMARG PRIx64 +#define FMT_prom_arg "%" PRIdPROMARG +#define FMT_prom_uarg "%" PRIuPROMARG +#define FMT_prom_uargx "%016" PRIxPROMARG + #define FMT_elf "%#x" #define bitspercell (sizeof(cell)<<3) Modified: trunk/openbios-devel/include/arch/ia64/types.h ============================================================================== --- trunk/openbios-devel/include/arch/ia64/types.h Sun Feb 13 20:56:29 2011 (r1027) +++ trunk/openbios-devel/include/arch/ia64/types.h Sun Feb 13 21:31:14 2011 (r1028) @@ -30,6 +30,16 @@ typedef __int128_t dcell; typedef __uint128_t ducell; +typedef int64_t prom_arg_t; +typedef uint64_t prom_uarg_t; + +#define PRIdPROMARG PRId64 +#define PRIuPROMARG PRIu64 +#define PRIxPROMARG PRIx64 +#define FMT_prom_arg "%" PRIdPROMARG +#define FMT_prom_uarg "%" PRIuPROMARG +#define FMT_prom_uargx "%016" PRIxPROMARG + #define bitspercell (sizeof(cell)<<3) #define bitsperdcell (sizeof(dcell)<<3) Modified: trunk/openbios-devel/include/arch/ppc/types.h ============================================================================== --- trunk/openbios-devel/include/arch/ppc/types.h Sun Feb 13 20:56:29 2011 (r1027) +++ trunk/openbios-devel/include/arch/ppc/types.h Sun Feb 13 21:31:14 2011 (r1028) @@ -60,6 +60,16 @@ #define FMT_ucellx "%08x" #define FMT_ucellX "%08X" +typedef int32_t prom_arg_t; +typedef uint32_t prom_uarg_t; + +#define PRIdPROMARG PRId32 +#define PRIuPROMARG PRIu32 +#define PRIxPROMARG PRIx32 +#define FMT_prom_arg "%" PRIdPROMARG +#define FMT_prom_uarg "%" PRIuPROMARG +#define FMT_prom_uargx "%08" PRIxPROMARG + #define FMT_elf "%#x" #define FMT_sizet "%lx" #define FMT_aout_ehdr "%lx" Modified: trunk/openbios-devel/include/arch/sparc32/types.h ============================================================================== --- trunk/openbios-devel/include/arch/sparc32/types.h Sun Feb 13 20:56:29 2011 (r1027) +++ trunk/openbios-devel/include/arch/sparc32/types.h Sun Feb 13 21:31:14 2011 (r1028) @@ -57,6 +57,16 @@ #define FMT_ucellx "%08x" #define FMT_ucellX "%08X" +typedef int32_t prom_arg_t; +typedef uint32_t prom_uarg_t; + +#define PRIdPROMARG PRId32 +#define PRIuPROMARG PRIu32 +#define PRIxPROMARG PRIx32 +#define FMT_prom_arg "%" PRIdPROMARG +#define FMT_prom_uarg "%" PRIuPROMARG +#define FMT_prom_uargx "%08" PRIxPROMARG + #define FMT_elf "%#x" #define FMT_sizet "%lx" #define FMT_aout_ehdr "%lx" Modified: trunk/openbios-devel/include/arch/sparc64/types.h ============================================================================== --- trunk/openbios-devel/include/arch/sparc64/types.h Sun Feb 13 20:56:29 2011 (r1027) +++ trunk/openbios-devel/include/arch/sparc64/types.h Sun Feb 13 21:31:14 2011 (r1028) @@ -53,6 +53,16 @@ #define FMT_ucellx "%016llx" #define FMT_ucellX "%016llX" +typedef int64_t prom_arg_t; +typedef uint64_t prom_uarg_t; + +#define PRIdPROMARG PRId64 +#define PRIuPROMARG PRIu64 +#define PRIxPROMARG PRIx64 +#define FMT_prom_arg "%" PRIdPROMARG +#define FMT_prom_uarg "%" PRIuPROMARG +#define FMT_prom_uargx "%016" PRIxPROMARG + #define FMT_elf "%#llx" #define FMT_sizet "%lx" #define FMT_aout_ehdr "%x" Modified: trunk/openbios-devel/include/arch/x86/types.h ============================================================================== --- trunk/openbios-devel/include/arch/x86/types.h Sun Feb 13 20:56:29 2011 (r1027) +++ trunk/openbios-devel/include/arch/x86/types.h Sun Feb 13 21:31:14 2011 (r1028) @@ -35,6 +35,16 @@ #define FMT_ucellx "%08x" #define FMT_ucellX "%08X" +typedef int32_t prom_arg_t; +typedef uint32_t prom_uarg_t; + +#define PRIdPROMARG PRId32 +#define PRIuPROMARG PRIu32 +#define PRIxPROMARG PRIx32 +#define FMT_prom_arg "%" PRIdPROMARG +#define FMT_prom_uarg "%" PRIuPROMARG +#define FMT_prom_uargx "%08" PRIxPROMARG + #define FMT_elf "%#x" #define bitspercell (sizeof(cell)<<3) Modified: trunk/openbios-devel/libopenbios/client.c ============================================================================== --- trunk/openbios-devel/libopenbios/client.c Sun Feb 13 20:56:29 2011 (r1027) +++ trunk/openbios-devel/libopenbios/client.c Sun Feb 13 21:31:14 2011 (r1028) @@ -32,11 +32,23 @@ #define PROM_MAX_ARGS 10 typedef struct prom_args { - const char *service; - long nargs; - long nret; - unsigned long args[PROM_MAX_ARGS]; -} prom_args_t; + prom_uarg_t service; + prom_arg_t nargs; + prom_arg_t nret; + prom_uarg_t args[PROM_MAX_ARGS]; +} __attribute__((packed)) prom_args_t; + +static inline const char * +arg2pointer(prom_uarg_t value) +{ + return (char*)(uintptr_t)value; +} + +static inline const char * +get_service(prom_args_t *pb) +{ + return arg2pointer(pb->service); +} #ifdef DEBUG_CIF static void memdump(const char *mem, unsigned long size) @@ -73,83 +85,84 @@ static void dump_service(prom_args_t *pb) { int i; - if (strcmp(pb->service, "test") == 0) { - printk("test(\"%s\") = ", (char*)pb->args[0]); - } else if (strcmp(pb->service, "peer") == 0) { - printk("peer(0x%08lx) = ", pb->args[0]); - } else if (strcmp(pb->service, "child") == 0) { - printk("child(0x%08lx) = ", pb->args[0]); - } else if (strcmp(pb->service, "parent") == 0) { - printk("parent(0x%08lx) = ", pb->args[0]); - } else if (strcmp(pb->service, "instance-to-package") == 0) { - printk("instance-to-package(0x%08lx) = ", pb->args[0]); - } else if (strcmp(pb->service, "getproplen") == 0) { - printk("getproplen(0x%08lx, \"%s\") = ", - pb->args[0], (char*)pb->args[1]); - } else if (strcmp(pb->service, "getprop") == 0) { - printk("getprop(0x%08lx, \"%s\", 0x%08lx, %ld) = ", - pb->args[0], (char*)pb->args[1], + const char *service = get_service(pb); + if (strcmp(service, "test") == 0) { + printk("test(\"%s\") = ", arg2pointer(pb->args[0])); + } else if (strcmp(service, "peer") == 0) { + printk("peer(0x" FMT_prom_uargx ") = ", pb->args[0]); + } else if (strcmp(service, "child") == 0) { + printk("child(0x" FMT_prom_uargx ") = ", pb->args[0]); + } else if (strcmp(service, "parent") == 0) { + printk("parent(0x" FMT_prom_uargx ") = ", pb->args[0]); + } else if (strcmp(service, "instance-to-package") == 0) { + printk("instance-to-package(0x" FMT_prom_uargx ") = ", pb->args[0]); + } else if (strcmp(service, "getproplen") == 0) { + printk("getproplen(0x" FMT_prom_uargx ", \"%s\") = ", + pb->args[0], arg2pointer(pb->args[1])); + } else if (strcmp(service, "getprop") == 0) { + printk("getprop(0x" FMT_prom_uargx ", \"%s\", 0x" FMT_prom_uargx ", " FMT_prom_arg ") = ", + pb->args[0], arg2pointer(pb->args[1]), pb->args[2], pb->args[3]); - } else if (strcmp(pb->service, "nextprop") == 0) { - printk("nextprop(0x%08lx, \"%s\", 0x%08lx) = ", - pb->args[0], (char*)pb->args[1], pb->args[2]); - } else if (strcmp(pb->service, "setprop") == 0) { - printk("setprop(0x%08lx, \"%s\", 0x%08lx, %ld)\n", - pb->args[0], (char*)pb->args[1], + } else if (strcmp(service, "nextprop") == 0) { + printk("nextprop(0x" FMT_prom_uargx ", \"%s\", 0x" FMT_prom_uargx ") = ", + pb->args[0], arg2pointer(pb->args[1]), pb->args[2]); + } else if (strcmp(service, "setprop") == 0) { + printk("setprop(0x" FMT_prom_uargx ", \"%s\", 0x" FMT_prom_uargx ", " FMT_prom_arg ")\n", + pb->args[0], arg2pointer(pb->args[1]), pb->args[2], pb->args[3]); - memdump((char*)pb->args[2], pb->args[3]); + memdump(arg2pointer(pb->args[2]), pb->args[3]); printk(" = "); - } else if (strcmp(pb->service, "canon") == 0) { - printk("canon(\"%s\", 0x%08lx, %ld)\n", - (char*)pb->args[0], pb->args[1], pb->args[2]); - } else if (strcmp(pb->service, "finddevice") == 0) { - printk("finddevice(\"%s\") = ", (char*)pb->args[0]); - } else if (strcmp(pb->service, "instance-to-path") == 0) { - printk("instance-to-path(0x%08lx, 0x%08lx, %ld) = ", + } else if (strcmp(service, "canon") == 0) { + printk("canon(\"%s\", 0x" FMT_prom_uargx ", " FMT_prom_arg ")\n", + arg2pointer(pb->args[0]), pb->args[1], pb->args[2]); + } else if (strcmp(service, "finddevice") == 0) { + printk("finddevice(\"%s\") = ", arg2pointer(pb->args[0])); + } else if (strcmp(service, "instance-to-path") == 0) { + printk("instance-to-path(0x" FMT_prom_uargx ", 0x" FMT_prom_uargx ", " FMT_prom_arg ") = ", pb->args[0], pb->args[1], pb->args[2]); - } else if (strcmp(pb->service, "package-to-path") == 0) { - printk("package-to-path(0x%08lx, 0x%08lx, %ld) = ", + } else if (strcmp(service, "package-to-path") == 0) { + printk("package-to-path(0x" FMT_prom_uargx ", 0x" FMT_prom_uargx ", " FMT_prom_arg ") = ", pb->args[0], pb->args[1], pb->args[2]); - } else if (strcmp(pb->service, "open") == 0) { - printk("open(\"%s\") = ", (char*)pb->args[0]); - } else if (strcmp(pb->service, "close") == 0) { - printk("close(0x%08lx)\n", pb->args[0]); - } else if (strcmp(pb->service, "read") == 0) { + } else if (strcmp(service, "open") == 0) { + printk("open(\"%s\") = ", arg2pointer(pb->args[0])); + } else if (strcmp(service, "close") == 0) { + printk("close(0x" FMT_prom_uargx ")\n", pb->args[0]); + } else if (strcmp(service, "read") == 0) { #ifdef DUMP_IO - printk("read(0x%08lx, 0x%08lx, %ld) = ", + printk("read(0x" FMT_prom_uargx ", 0x" FMT_prom_uargx ", " FMT_prom_arg ") = ", pb->args[0], pb->args[1], pb->args[2]); #endif - } else if (strcmp(pb->service, "write") == 0) { + } else if (strcmp(service, "write") == 0) { #ifdef DUMP_IO - printk("write(0x%08lx, 0x%08lx, %ld)\n", + printk("write(0x" FMT_prom_uargx ", 0x" FMT_prom_uargx ", " FMT_prom_arg ")\n", pb->args[0], pb->args[1], pb->args[2]); - memdump((char*)pb->args[1], pb->args[2]); + memdump(arg2pointer(pb->args[1]), pb->args[2]); printk(" = "); #endif - } else if (strcmp(pb->service, "seek") == 0) { + } else if (strcmp(service, "seek") == 0) { #ifdef DUMP_IO - printk("seek(0x%08lx, 0x%08lx, 0x%08lx) = ", + printk("seek(0x" FMT_prom_uargx ", 0x" FMT_prom_uargx ", 0x" FMT_prom_uargx ") = ", pb->args[0], pb->args[1], pb->args[2]); #endif - } else if (strcmp(pb->service, "claim") == 0) { - printk("claim(0x%08lx, %ld, %ld) = ", + } else if (strcmp(service, "claim") == 0) { + printk("claim(0x" FMT_prom_uargx ", " FMT_prom_arg ", " FMT_prom_arg ") = ", pb->args[0], pb->args[1], pb->args[2]); - } else if (strcmp(pb->service, "release") == 0) { - printk("release(0x%08lx, %ld)\n", + } else if (strcmp(service, "release") == 0) { + printk("release(0x" FMT_prom_uargx ", " FMT_prom_arg ")\n", pb->args[0], pb->args[1]); - } else if (strcmp(pb->service, "boot") == 0) { - printk("boot \"%s\"\n", (char*)pb->args[0]); - } else if (strcmp(pb->service, "enter") == 0) { + } else if (strcmp(service, "boot") == 0) { + printk("boot \"%s\"\n", arg2pointer(pb->args[0])); + } else if (strcmp(service, "enter") == 0) { printk("enter()\n"); - } else if (strcmp(pb->service, "exit") == 0) { + } else if (strcmp(service, "exit") == 0) { printk("exit()\n"); - } else if (strcmp(pb->service, "test-method") == 0) { - printk("test-method(0x%08lx, \"%s\") = ", - pb->args[0], (char*)pb->args[1]); + } else if (strcmp(service, "test-method") == 0) { + printk("test-method(0x" FMT_prom_uargx ", \"%s\") = ", + pb->args[0], arg2pointer(pb->args[1])); } else { - printk("of_client_interface: %s ", pb->service ); + printk("of_client_interface: %s", service); for( i = 0; i < pb->nargs; i++ ) - printk("%lx ", pb->args[i] ); + printk(" " FMT_prom_uargx, pb->args[i]); printk("\n"); } } @@ -157,71 +170,72 @@ static void dump_return(prom_args_t *pb) { int i; - if (strcmp(pb->service, "test") == 0) { - printk(" %ld\n", pb->args[pb->nargs]); - } else if (strcmp(pb->service, "peer") == 0) { - printk("0x%08lx\n", pb->args[pb->nargs]); - } else if (strcmp(pb->service, "child") == 0) { - printk("0x%08lx\n", pb->args[pb->nargs]); - } else if (strcmp(pb->service, "parent") == 0) { - printk("0x%08lx\n", pb->args[pb->nargs]); - } else if (strcmp(pb->service, "instance-to-package") == 0) { - printk("0x%08lx\n", pb->args[pb->nargs]); - } else if (strcmp(pb->service, "getproplen") == 0) { - printk("0x%08lx\n", pb->args[pb->nargs]); - } else if (strcmp(pb->service, "getprop") == 0) { - printk("%ld\n", pb->args[pb->nargs]); - if ((long)pb->args[pb->nargs] != -1) - memdump((char*)pb->args[2], MIN(pb->args[3], pb->args[pb->nargs])); - } else if (strcmp(pb->service, "nextprop") == 0) { - printk("%ld\n", pb->args[pb->nargs]); - memdump((char*)pb->args[2], pb->args[pb->nargs]); - } else if (strcmp(pb->service, "setprop") == 0) { - printk("%ld\n", pb->args[pb->nargs]); - } else if (strcmp(pb->service, "canon") == 0) { - printk("%ld\n", pb->args[pb->nargs]); - memdump((char*)pb->args[1], pb->args[pb->nargs]); - } else if (strcmp(pb->service, "finddevice") == 0) { - printk("0x%08lx\n", pb->args[pb->nargs]); - } else if (strcmp(pb->service, "instance-to-path") == 0) { - printk("%ld\n", pb->args[pb->nargs]); - memdump((char*)pb->args[1], pb->args[pb->nargs]); - } else if (strcmp(pb->service, "package-to-path") == 0) { - printk("%ld\n", pb->args[pb->nargs]); - memdump((char*)pb->args[1], pb->args[pb->nargs]); - } else if (strcmp(pb->service, "open") == 0) { - printk("0x%08lx\n", pb->args[pb->nargs]); - } else if (strcmp(pb->service, "close") == 0) { + const char *service = get_service(pb); + if (strcmp(service, "test") == 0) { + printk(FMT_prom_arg "\n", pb->args[pb->nargs]); + } else if (strcmp(service, "peer") == 0) { + printk("0x" FMT_prom_uargx "\n", pb->args[pb->nargs]); + } else if (strcmp(service, "child") == 0) { + printk("0x" FMT_prom_uargx "\n", pb->args[pb->nargs]); + } else if (strcmp(service, "parent") == 0) { + printk("0x" FMT_prom_uargx "\n", pb->args[pb->nargs]); + } else if (strcmp(service, "instance-to-package") == 0) { + printk("0x" FMT_prom_uargx "\n", pb->args[pb->nargs]); + } else if (strcmp(service, "getproplen") == 0) { + printk("0x" FMT_prom_uargx "\n", pb->args[pb->nargs]); + } else if (strcmp(service, "getprop") == 0) { + printk(FMT_prom_arg "\n", pb->args[pb->nargs]); + if ((prom_arg_t)pb->args[pb->nargs] != -1) + memdump(arg2pointer(pb->args[2]), MIN(pb->args[3], pb->args[pb->nargs])); + } else if (strcmp(service, "nextprop") == 0) { + printk(FMT_prom_arg "\n", pb->args[pb->nargs]); + memdump(arg2pointer(pb->args[2]), pb->args[pb->nargs]); + } else if (strcmp(service, "setprop") == 0) { + printk(FMT_prom_arg "\n", pb->args[pb->nargs]); + } else if (strcmp(service, "canon") == 0) { + printk(FMT_prom_arg "\n", pb->args[pb->nargs]); + memdump(arg2pointer(pb->args[1]), pb->args[pb->nargs]); + } else if (strcmp(service, "finddevice") == 0) { + printk("0x" FMT_prom_uargx "\n", pb->args[pb->nargs]); + } else if (strcmp(service, "instance-to-path") == 0) { + printk(FMT_prom_arg "\n", pb->args[pb->nargs]); + memdump(arg2pointer(pb->args[1]), pb->args[pb->nargs]); + } else if (strcmp(service, "package-to-path") == 0) { + printk(FMT_prom_arg "\n", pb->args[pb->nargs]); + memdump(arg2pointer(pb->args[1]), pb->args[pb->nargs]); + } else if (strcmp(service, "open") == 0) { + printk("0x" FMT_prom_uargx "\n", pb->args[pb->nargs]); + } else if (strcmp(service, "close") == 0) { /* do nothing */ - } else if (strcmp(pb->service, "read") == 0) { + } else if (strcmp(service, "read") == 0) { #ifdef DUMP_IO - printk("%ld\n", pb->args[pb->nargs]); - memdump((char*)pb->args[1], pb->args[pb->nargs]); + printk(FMT_prom_arg "\n", pb->args[pb->nargs]); + memdump(arg2pointer(pb->args[1]), pb->args[pb->nargs]); #endif - } else if (strcmp(pb->service, "write") == 0) { + } else if (strcmp(service, "write") == 0) { #ifdef DUMP_IO - printk("%ld\n", pb->args[pb->nargs]); + printk(FMT_prom_arg "\n", pb->args[pb->nargs]); #endif - } else if (strcmp(pb->service, "seek") == 0) { + } else if (strcmp(service, "seek") == 0) { #ifdef DUMP_IO - printk("%ld\n", pb->args[pb->nargs]); + printk(FMT_prom_arg "\n", pb->args[pb->nargs]); #endif - } else if (strcmp(pb->service, "claim") == 0) { - printk("0x%08lx\n", pb->args[pb->nargs]); - } else if (strcmp(pb->service, "release") == 0) { + } else if (strcmp(service, "claim") == 0) { + printk("0x" FMT_prom_uargx "\n", pb->args[pb->nargs]); + } else if (strcmp(service, "release") == 0) { /* do nothing */ - } else if (strcmp(pb->service, "boot") == 0) { + } else if (strcmp(service, "boot") == 0) { /* do nothing */ - } else if (strcmp(pb->service, "enter") == 0) { + } else if (strcmp(service, "enter") == 0) { /* do nothing */ - } else if (strcmp(pb->service, "exit") == 0) { + } else if (strcmp(service, "exit") == 0) { /* do nothing */ - } else if (strcmp(pb->service, "test-method") == 0) { - printk("0x%08lx\n", pb->args[pb->nargs]); + } else if (strcmp(service, "test-method") == 0) { + printk("0x" FMT_prom_uargx "\n", pb->args[pb->nargs]); } else { printk("of_client_interface return:"); for (i = 0; i < pb->nret; i++) { - printk(" %lx", pb->args[pb->nargs + i]); + printk(" " FMT_prom_uargx, pb->args[pb->nargs + i]); } printk("\n"); } @@ -233,17 +247,17 @@ handle_calls( prom_args_t *pb ) { int i, dstacksave = dstackcnt; - long val; + prom_uarg_t val; #ifdef DEBUG_CIF - printk("%s %s ([%ld] -- [%ld])\n", pb->service, (char *)pb->args[0], - pb->nargs, pb->nret); + printk("%s %s ([" FMT_prom_arg "] -- [" FMT_prom_arg "])\n", + get_service(pb), arg2pointer(pb->args[0]), pb->nargs, pb->nret); #endif for( i=pb->nargs-1; i>=0; i-- ) PUSH( pb->args[i] ); - push_str( pb->service ); + push_str(get_service(pb)); fword("client-call-iface"); /* Drop the return code from client-call-iface (status is handled by the @@ -260,17 +274,18 @@ } #ifdef DEBUG_CIF - /* useful for debug but not necessarily an error */ - if( i != pb->nret || dstackcnt != dstacksave ) { - printk("%s '%s': possible argument error (%ld--%ld) got %d\n", - pb->service, (char*)pb->args[0], pb->nargs-2, pb->nret, i ); - } - - printk("handle_calls return: "); - for (i = 0; i < pb->nret; i++) { - printk("%lx ", pb->args[pb->nargs + i]); - } - printk("\n"); + /* useful for debug but not necessarily an error */ + if (i != pb->nret || dstackcnt != dstacksave) { + printk("%s '%s': possible argument error (" FMT_prom_arg "--" FMT_prom_arg ") got %d\n", + get_service(pb), arg2pointer(pb->args[0]), + pb->nargs - 2, pb->nret, i); + } + + printk("handle_calls return:"); + for (i = 0; i < pb->nret; i++) { + printk(" " FMT_prom_uargx, pb->args[pb->nargs + i]); + } + printk("\n"); #endif dstackcnt = dstacksave; @@ -292,21 +307,21 @@ #endif /* call-method exceptions are special */ - if( !strcmp("call-method", pb->service) || !strcmp("interpret", pb->service) ) + if (!strcmp("call-method", get_service(pb)) || !strcmp("interpret", get_service(pb))) return handle_calls( pb ); dstacksave = dstackcnt; for( i=pb->nargs-1; i>=0; i-- ) PUSH( pb->args[i] ); - push_str( pb->service ); + push_str(get_service(pb)); fword("client-iface"); if( (val=POP()) ) { dstackcnt = dstacksave; if( val == -1 ) - printk("Unimplemented service %s ([%ld] -- [%ld])\n", - pb->service, pb->nargs, pb->nret ); + printk("Unimplemented service %s ([" FMT_prom_arg "] -- [" FMT_prom_arg "])\n", + get_service(pb), pb->nargs, pb->nret ); #ifdef DEBUG_CIF else printk("ERROR!\n"); @@ -320,7 +335,7 @@ if( dstackcnt != dstacksave ) { #ifdef DEBUG_CIF printk("service %s: possible argument error (%d %d)\n", - pb->service, i, dstackcnt - dstacksave ); + get_service(pb), i, dstackcnt - dstacksave ); #endif /* Some clients request less parameters than the CIF method returns, e.g. getprop with OpenSolaris. Hence we drop any

1 0

[commit] r1027 - in trunk/openbios-devel/include/arch: ppc sparc32 sparc64
by repository service 13 Feb '11

13 Feb '11

Author: afaerber Date: Sun Feb 13 20:56:29 2011 New Revision: 1027 URL: http://tracker.coreboot.org/trac/openbios/changeset/1027 Log: Add remaining PRI* macros For sparc32 some format macros had been added already. For symmetry, add PRI{d,u}64, too, and PRI{d,u}{32,64} for the other architectures as well. Add PRIX{32,64} for all. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/include/arch/ppc/types.h trunk/openbios-devel/include/arch/sparc32/types.h trunk/openbios-devel/include/arch/sparc64/types.h Modified: trunk/openbios-devel/include/arch/ppc/types.h ============================================================================== --- trunk/openbios-devel/include/arch/ppc/types.h Sun Feb 13 00:02:18 2011 (r1026) +++ trunk/openbios-devel/include/arch/ppc/types.h Sun Feb 13 20:56:29 2011 (r1027) @@ -26,8 +26,14 @@ typedef long long int64_t; typedef long intptr_t; +#define PRId32 "d" +#define PRIu32 "u" #define PRIx32 "x" +#define PRIX32 "X" +#define PRId64 "lld" +#define PRIu64 "llu" #define PRIx64 "llx" +#define PRIX64 "llX" #endif /* endianess */ Modified: trunk/openbios-devel/include/arch/sparc32/types.h ============================================================================== --- trunk/openbios-devel/include/arch/sparc32/types.h Sun Feb 13 00:02:18 2011 (r1026) +++ trunk/openbios-devel/include/arch/sparc32/types.h Sun Feb 13 20:56:29 2011 (r1027) @@ -29,7 +29,11 @@ #define PRId32 "d" #define PRIu32 "u" #define PRIx32 "x" +#define PRIX32 "X" +#define PRId64 "lld" +#define PRIu64 "llu" #define PRIx64 "llx" +#define PRIX64 "llX" #endif /* endianess */ Modified: trunk/openbios-devel/include/arch/sparc64/types.h ============================================================================== --- trunk/openbios-devel/include/arch/sparc64/types.h Sun Feb 13 00:02:18 2011 (r1026) +++ trunk/openbios-devel/include/arch/sparc64/types.h Sun Feb 13 20:56:29 2011 (r1027) @@ -26,8 +26,14 @@ typedef long long int64_t; typedef long intptr_t; +#define PRId32 "d" +#define PRIu32 "u" #define PRIx32 "x" +#define PRIX32 "X" +#define PRId64 "lld" +#define PRIu64 "llu" #define PRIx64 "llx" +#define PRIX64 "llX" #endif /* endianess */

1 0

[commit] r1026 - in trunk/openbios-devel/include/arch: amd64 ia64 sparc32 sparc64 x86
by repository service 13 Feb '11

13 Feb '11

Author: afaerber Date: Sun Feb 13 00:02:18 2011 New Revision: 1026 URL: http://tracker.coreboot.org/trac/openbios/changeset/1026 Log: PRI* macros need inttypes.h Ever since introducing PRI* macros for FMT_plx, we risked using them during bootstrap. According to POSIX.1-2008 the PRI* macros are defined in inttypes.h, which in turn includes stdint.h. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/include/arch/amd64/types.h trunk/openbios-devel/include/arch/ia64/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 Modified: trunk/openbios-devel/include/arch/amd64/types.h ============================================================================== --- trunk/openbios-devel/include/arch/amd64/types.h Sat Feb 12 17:28:06 2011 (r1025) +++ trunk/openbios-devel/include/arch/amd64/types.h Sun Feb 13 00:02:18 2011 (r1026) @@ -11,7 +11,7 @@ #ifndef __TYPES_H #define __TYPES_H -#include <stdint.h> +#include <inttypes.h> /* endianess */ #include "autoconf.h" Modified: trunk/openbios-devel/include/arch/ia64/types.h ============================================================================== --- trunk/openbios-devel/include/arch/ia64/types.h Sat Feb 12 17:28:06 2011 (r1025) +++ trunk/openbios-devel/include/arch/ia64/types.h Sun Feb 13 00:02:18 2011 (r1026) @@ -11,7 +11,7 @@ #ifndef __TYPES_H #define __TYPES_H -#include <stdint.h> +#include <inttypes.h> /* endianess */ Modified: trunk/openbios-devel/include/arch/sparc32/types.h ============================================================================== --- trunk/openbios-devel/include/arch/sparc32/types.h Sat Feb 12 17:28:06 2011 (r1025) +++ trunk/openbios-devel/include/arch/sparc32/types.h Sun Feb 13 00:02:18 2011 (r1026) @@ -12,7 +12,7 @@ #include "mconfig.h" #ifdef BOOTSTRAP -#include <stdint.h> +#include <inttypes.h> #else typedef unsigned char uint8_t; typedef unsigned short uint16_t; Modified: trunk/openbios-devel/include/arch/sparc64/types.h ============================================================================== --- trunk/openbios-devel/include/arch/sparc64/types.h Sat Feb 12 17:28:06 2011 (r1025) +++ trunk/openbios-devel/include/arch/sparc64/types.h Sun Feb 13 00:02:18 2011 (r1026) @@ -12,7 +12,7 @@ #include "mconfig.h" #ifdef BOOTSTRAP -#include <stdint.h> +#include <inttypes.h> #else typedef unsigned char uint8_t; typedef unsigned short uint16_t; Modified: trunk/openbios-devel/include/arch/x86/types.h ============================================================================== --- trunk/openbios-devel/include/arch/x86/types.h Sat Feb 12 17:28:06 2011 (r1025) +++ trunk/openbios-devel/include/arch/x86/types.h Sun Feb 13 00:02:18 2011 (r1026) @@ -11,7 +11,7 @@ #ifndef __TYPES_H #define __TYPES_H -#include <stdint.h> +#include <inttypes.h> /* endianess */

1 0

[PATCH] sparc32: fix __context corruption in __switch_context_nosave
by Artyom Tarasenko 12 Feb '11

12 Feb '11

__switch_context_nosave shall not write to __context, only read it. Signed-off-by: Artyom Tarasenko <atar4qemu(a)gmail.com> --- arch/sparc32/switch.S (revision 1024) +++ arch/sparc32/switch.S (working copy) @@ -79,11 +79,14 @@ set (PSR_PS | PSR_S | PSR_PIL | PSR_EF), %g2 wr %g2, 0x0, %psr #endif - + set __context, %g1 + swap [%g1], %fp + ba __set_context __switch_context_nosave: - set __context, %g1 + set __context, %g1 /* Swap ctx pointer with %fp */ - swap [%g1], %fp + ld [%g1], %fp +__set_context: /* Load all registers */ /* offset 0: %g0, no need to load */ ld [%fp + 4], %g1 --- Regards, Artyom Tarasenko solaris/sparc under qemu blog: http://tyom.blogspot.com/

2 8

[commit] r1025 - trunk/openbios-devel/arch/sparc32
by repository service 12 Feb '11

12 Feb '11

Author: blueswirl Date: Sat Feb 12 17:28:06 2011 New Revision: 1025 URL: http://tracker.coreboot.org/trac/openbios/changeset/1025 Log: sparc32: fix __context corruption in __switch_context_nosave __switch_context_nosave shall not write to __context, only read it. Signed-off-by: Artyom Tarasenko <atar4qemu(a)gmail.com> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc32/switch.S Modified: trunk/openbios-devel/arch/sparc32/switch.S ============================================================================== --- trunk/openbios-devel/arch/sparc32/switch.S Tue Feb 8 23:06:59 2011 (r1024) +++ trunk/openbios-devel/arch/sparc32/switch.S Sat Feb 12 17:28:06 2011 (r1025) @@ -79,11 +79,15 @@ set (PSR_PS | PSR_S | PSR_PIL | PSR_EF), %g2 wr %g2, 0x0, %psr #endif - + set __context, %g1 + /* Swap ctx pointer with %fp and jump*/ + ba __set_context + swap [%g1], %fp __switch_context_nosave: - set __context, %g1 - /* Swap ctx pointer with %fp */ - swap [%g1], %fp + set __context, %g1 + /* load %fp from ctx pointer */ + ld [%g1], %fp +__set_context: /* Load all registers */ /* offset 0: %g0, no need to load */ ld [%fp + 4], %g1

1 0

sparc32 __context initialization
by Artyom Tarasenko 11 Feb '11

11 Feb '11

According to the IEEE-1275 SPARC supplement, the default load address is the virtual address 0x4000, so looks like we don't have to map the addresses 0x0 - 0x3fff. I thought it might be useful actually not to map at least the page 0, as it would help to catch null pointer dereferences. So, I went on and made a trivial modification: --- arch/sparc32/lib.c (revision 1024) +++ arch/sparc32/lib.c (working copy) @@ -461,7 +461,7 @@ map_pages(pa, va, size, ofmem_arch_default_translation_mode(pa)); // 1:1 mapping for RAM - map_pages(0, 0, LOWMEMSZ, ofmem_arch_default_translation_mode(0)); + map_pages(0x4000, 0x4000, LOWMEMSZ, ofmem_arch_default_translation_mode(0)); /* * Flush cache ___ Surprisingly, with this modification a null pointer dereference happens much earlier than I'd expected: for some reason __context doesn't get initialized in arch/sparc32/context.c, so OpenBIOS dies before saying hello. If I initialize it in start_main the same way it should have been initialized statically, start_main(void) { + __context = &main_ctx; then OpenBIOS starts and is able to boot at least Debian. Any idea what might be wrong with the current static initialization? For convenience I paste the code from arch/sparc32/context.c : static struct context main_ctx = { .regs[REG_SP] = (uint32_t) &_estack - 96, .pc = (uint32_t) start_main, .npc = (uint32_t) start_main + 4, .return_addr = (uint32_t) __exit_context, }; /* This is used by assembly routine to load/store the context which * it is to switch/switched. */ struct context *__context = &main_ctx; -- Regards, Artyom Tarasenko solaris/sparc under qemu blog: http://tyom.blogspot.com/

4 10

[commit] r1024 - trunk/openbios-devel/libopenbios
by repository service 08 Feb '11

08 Feb '11

Author: mcayland Date: Tue Feb 8 23:06:59 2011 New Revision: 1024 URL: http://tracker.coreboot.org/trac/openbios/changeset/1024 Log: OFMEM: Fix bogus tail entry added to the end of the virtual memory available list. Since top_address is 64-bit, the existing code would incorrectly think that the end of virtual memory had not been reached and so add a bogus tail entry. Casting -1 to ucell should ensure that we pass the correct top address for virtual memory. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.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 Tue Feb 8 23:06:56 2011 (r1023) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Tue Feb 8 23:06:59 2011 (r1024) @@ -347,7 +347,7 @@ ofmem_update_memory_available(s_phandle_memory, ofmem->phys_range, &phys_range_prop, &phys_range_prop_size, &phys_range_prop_used, ofmem_arch_get_phys_top()); ofmem_update_memory_available(s_phandle_mmu, ofmem->virt_range, - &virt_range_prop, &virt_range_prop_size, &virt_range_prop_used, -1ULL); + &virt_range_prop, &virt_range_prop_size, &virt_range_prop_used, (ucell)-1); ofmem_update_mmu_translations(); }

1 0

[commit] r1023 - trunk/openbios-devel/libopenbios
by repository service 08 Feb '11

08 Feb '11

Author: mcayland Date: Tue Feb 8 23:06:56 2011 New Revision: 1023 URL: http://tracker.coreboot.org/trac/openbios/changeset/1023 Log: OFMEM: Fix missing ofmem_update_translations() calls. Otherwise the device tree properties will not always get updated to reflect the current memory ranges. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.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 Tue Feb 8 23:06:54 2011 (r1022) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Tue Feb 8 23:06:56 2011 (r1023) @@ -481,6 +481,7 @@ return -1; } add_entry( phys, size, &ofmem->phys_range ); + ofmem_update_translations(); return phys; } phys = find_area( align, size, ofmem->phys_range, min, max, reverse ); @@ -515,6 +516,7 @@ return -1; } add_entry( virt, size, &ofmem->virt_range ); + ofmem_update_translations(); return virt; } @@ -524,6 +526,9 @@ return -1; } add_entry( virt, size, &ofmem->virt_range ); + + ofmem_update_translations(); + return virt; }

1 0

[commit] r1022 - in trunk/openbios-devel: arch/sparc32 drivers
by repository service 08 Feb '11

08 Feb '11

Author: mcayland Date: Tue Feb 8 23:06:54 2011 New Revision: 1022 URL: http://tracker.coreboot.org/trac/openbios/changeset/1022 Log: Fix up /virtual-memory reg property on SPARC32. Make it similar to the OBP output with 2 entries consisting of half the virtual address space. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc32/lib.c trunk/openbios-devel/drivers/iommu.c Modified: trunk/openbios-devel/arch/sparc32/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/lib.c Tue Feb 8 23:06:51 2011 (r1021) +++ trunk/openbios-devel/arch/sparc32/lib.c Tue Feb 8 23:06:54 2011 (r1022) @@ -373,7 +373,10 @@ void ob_init_mmu(void) { - ucell *reg; + ucell *memreg; + ucell *virtreg; + phys_addr_t virtregsize; + ofmem_t *ofmem = ofmem_arch_get_private(); init_romvec_mem(); @@ -391,18 +394,35 @@ ofmem_register(s_phandle_memory, s_phandle_mmu); /* Setup /memory:reg (totphys) property */ - reg = malloc(3 * sizeof(ucell)); - ofmem_arch_encode_physaddr(reg, 0); /* physical base */ - reg[2] = (ucell)ofmem_arch_get_phys_top(); /* size */ + memreg = malloc(3 * sizeof(ucell)); + ofmem_arch_encode_physaddr(memreg, 0); /* physical base */ + memreg[2] = (ucell)ofmem->ramsize; /* size */ push_str("/memory"); fword("find-device"); - PUSH(pointer2cell(reg)); + PUSH(pointer2cell(memreg)); PUSH(3 * sizeof(ucell)); push_str("reg"); PUSH_ph(s_phandle_memory); fword("encode-property"); + /* Setup /virtual-memory:reg property */ + virtregsize = ((phys_addr_t)((ucell)-1) + 1) / 2; + + virtreg = malloc(6 * sizeof(ucell)); + ofmem_arch_encode_physaddr(virtreg, 0); + virtreg[2] = virtregsize; + ofmem_arch_encode_physaddr(&virtreg[3], virtregsize); + virtreg[5] = virtregsize; + + push_str("/virtual-memory"); + fword("find-device"); + PUSH(pointer2cell(virtreg)); + PUSH(6 * sizeof(ucell)); + push_str("reg"); + PUSH_ph(s_phandle_mmu); + fword("encode-property"); + PUSH(0); fword("active-package!"); bind_func("pgmap@", pgmap_fetch); Modified: trunk/openbios-devel/drivers/iommu.c ============================================================================== --- trunk/openbios-devel/drivers/iommu.c Tue Feb 8 23:06:51 2011 (r1021) +++ trunk/openbios-devel/drivers/iommu.c Tue Feb 8 23:06:54 2011 (r1022) @@ -155,20 +155,6 @@ regs = iommu_init(&ciommu, base); - push_str("/virtual-memory"); - fword("find-device"); - - PUSH(base >> 32); - fword("encode-int"); - PUSH(base & 0xffffffff); - fword("encode-int"); - fword("encode+"); - PUSH(IOMMU_REGS); - fword("encode-int"); - fword("encode+"); - push_str("reg"); - fword("property"); - push_str("/iommu"); fword("find-device"); PUSH((unsigned long)regs);

1 0

[commit] r1021 - trunk/openbios-devel/arch/sparc32
by repository service 08 Feb '11

08 Feb '11

Author: mcayland Date: Tue Feb 8 23:06:51 2011 New Revision: 1021 URL: http://tracker.coreboot.org/trac/openbios/changeset/1021 Log: Explicitly claim physical and virtual memory used by OpenBIOS in OFMEM under SPARC32. This is required to ensure that Solaris doesn't consider the memory used by OpenBIOS as available when interpreting the memory lists. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c Modified: trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c Tue Feb 8 23:06:49 2011 (r1020) +++ trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c Tue Feb 8 23:06:51 2011 (r1021) @@ -161,4 +161,10 @@ { memset(&s_ofmem_data, 0, sizeof(s_ofmem_data)); s_ofmem_data.ofmem.ramsize = qemu_mem_size; + + /* Claim reserved physical addresses at top of RAM */ + ofmem_claim_phys(ofmem_arch_get_phys_top(), s_ofmem_data.ofmem.ramsize - ofmem_arch_get_phys_top(), 0); + + /* Claim OpenBIOS reserved space */ + ofmem_claim_virt(0xffd00000, 0x300000, 0); }

1 0

[commit] r1020 - trunk/openbios-devel/arch/sparc32
by repository service 08 Feb '11

08 Feb '11

Author: mcayland Date: Tue Feb 8 23:06:49 2011 New Revision: 1020 URL: http://tracker.coreboot.org/trac/openbios/changeset/1020 Log: Switch SPARC32 to use 2 address cells for addresses within the /virtual-memory available property. This matches the format of the /virtual-memory available property generated by OBP under QEMU. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c Modified: trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c Tue Feb 8 23:06:46 2011 (r1019) +++ trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c Tue Feb 8 23:06:49 2011 (r1020) @@ -127,11 +127,7 @@ /* Return the size of a memory available entry given the phandle in cells */ int ofmem_arch_get_available_entry_size(phandle_t ph) { - if (ph == s_phandle_memory) { - return 1 + ofmem_arch_get_physaddr_cellsize(); - } else { - return 1 + 1; - } + return 1 + ofmem_arch_get_physaddr_cellsize(); } /* Generate memory available property entry for Sparc32 */ @@ -139,12 +135,7 @@ { int i = 0; - if (ph == s_phandle_memory) { - i += ofmem_arch_encode_physaddr(availentry, start); - } else { - availentry[i++] = start; - } - + i += ofmem_arch_encode_physaddr(availentry, start); availentry[i] = size; }

1 0

[commit] r1019 - in trunk/openbios-devel: arch/ppc/qemu arch/sparc32 arch/sparc64 include/libopenbios libopenbios
by repository service 08 Feb '11

08 Feb '11

Author: mcayland Date: Tue Feb 8 23:06:46 2011 New Revision: 1019 URL: http://tracker.coreboot.org/trac/openbios/changeset/1019 Log: Delegate construction of memory "available" property to each architecture. This is required because some architectures do not strictly follow the convention of using physical addresses sizes in the /memory node and virtual addresses in the /virtual-memory node. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c trunk/openbios-devel/arch/sparc32/lib.c trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c trunk/openbios-devel/include/libopenbios/ofmem.h trunk/openbios-devel/libopenbios/ofmem_common.c Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sun Jan 30 14:07:40 2011 (r1018) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Tue Feb 8 23:06:46 2011 (r1019) @@ -195,6 +195,30 @@ transentry[i++] = t->mode; } +/* Return the size of a memory available entry given the phandle in cells */ +int ofmem_arch_get_available_entry_size(phandle_t ph) +{ + if (ph == s_phandle_memory) { + return 1 + ofmem_arch_get_physaddr_cellsize(); + } else { + return 1 + 1; + } +} + +/* Generate memory available property entry for PPC */ +void ofmem_arch_create_available_entry(phandle_t ph, ucell *availentry, phys_addr_t start, ucell size) +{ + int i = 0; + + if (ph == s_phandle_memory) { + i += ofmem_arch_encode_physaddr(availentry, start); + } else { + availentry[i++] = start; + } + + availentry[i] = size; +} + /************************************************************************/ /* OF private allocations */ /************************************************************************/ Modified: trunk/openbios-devel/arch/sparc32/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/lib.c Sun Jan 30 14:07:40 2011 (r1018) +++ trunk/openbios-devel/arch/sparc32/lib.c Tue Feb 8 23:06:46 2011 (r1019) @@ -59,8 +59,6 @@ static unsigned long *context_table; static unsigned long *l1; -static phandle_t s_phandle_memory = 0; -static phandle_t s_phandle_mmu = 0; static ucell *mem_reg = 0; static ucell *mem_avail = 0; static ucell *virt_avail = 0; Modified: trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c Sun Jan 30 14:07:40 2011 (r1018) +++ trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c Tue Feb 8 23:06:46 2011 (r1019) @@ -124,6 +124,30 @@ transentry[2] = t->mode; } +/* Return the size of a memory available entry given the phandle in cells */ +int ofmem_arch_get_available_entry_size(phandle_t ph) +{ + if (ph == s_phandle_memory) { + return 1 + ofmem_arch_get_physaddr_cellsize(); + } else { + return 1 + 1; + } +} + +/* Generate memory available property entry for Sparc32 */ +void ofmem_arch_create_available_entry(phandle_t ph, ucell *availentry, phys_addr_t start, ucell size) +{ + int i = 0; + + if (ph == s_phandle_memory) { + i += ofmem_arch_encode_physaddr(availentry, start); + } else { + availentry[i++] = start; + } + + availentry[i] = size; +} + /************************************************************************/ /* misc */ /************************************************************************/ Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Sun Jan 30 14:07:40 2011 (r1018) +++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Tue Feb 8 23:06:46 2011 (r1019) @@ -110,6 +110,30 @@ transentry[2] = t->mode; } +/* Return the size of a memory available entry given the phandle in cells */ +int ofmem_arch_get_available_entry_size(phandle_t ph) +{ + if (ph == s_phandle_memory) { + return 1 + ofmem_arch_get_physaddr_cellsize(); + } else { + return 1 + 1; + } +} + +/* Generate memory available property entry for Sparc64 */ +void ofmem_arch_create_available_entry(phandle_t ph, ucell *availentry, phys_addr_t start, ucell size) +{ + int i = 0; + + if (ph == s_phandle_memory) { + i += ofmem_arch_encode_physaddr(availentry, start); + } else { + availentry[i++] = start; + } + + availentry[i] = size; +} + /************************************************************************/ /* misc */ /************************************************************************/ Modified: trunk/openbios-devel/include/libopenbios/ofmem.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/ofmem.h Sun Jan 30 14:07:40 2011 (r1018) +++ trunk/openbios-devel/include/libopenbios/ofmem.h Tue Feb 8 23:06:46 2011 (r1019) @@ -69,6 +69,8 @@ extern retain_t* ofmem_arch_get_retained(void); extern int ofmem_arch_get_physaddr_cellsize(void); extern int ofmem_arch_encode_physaddr(ucell *p, phys_addr_t value); +extern int ofmem_arch_get_available_entry_size(phandle_t ph); +extern void ofmem_arch_create_available_entry(phandle_t ph, ucell *availentry, phys_addr_t start, ucell size); extern int ofmem_arch_get_translation_entry_size(void); extern void ofmem_arch_create_translation_entry(ucell *transentry, translation_t *t); extern ucell ofmem_arch_default_translation_mode( phys_addr_t phys ); @@ -120,6 +122,10 @@ extern void ofmem_release_virt( ucell virt, ucell size ); extern phys_addr_t ofmem_translate( ucell virt, ucell *ret_mode ); +/* memory and virtual-memory nodes */ +extern phandle_t s_phandle_memory; +extern phandle_t s_phandle_mmu; + /* Currently the same for all architectures */ #define PAGE_SHIFT 12 Modified: trunk/openbios-devel/libopenbios/ofmem_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/ofmem_common.c Sun Jan 30 14:07:40 2011 (r1018) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Tue Feb 8 23:06:46 2011 (r1019) @@ -222,8 +222,8 @@ fword("encode-property"); } -static phandle_t s_phandle_memory = 0; -static phandle_t s_phandle_mmu = 0; +phandle_t s_phandle_memory = 0; +phandle_t s_phandle_mmu = 0; static void ofmem_update_mmu_translations( void ) { @@ -290,8 +290,7 @@ /* inverse of phys_range list could take 2 or more additional cells for the tail For /memory, physical addresses may be wider than one ucell. */ - prop_used = (ncells + 1) * sizeof(ucell) * - (((ph == s_phandle_memory) ? ofmem_arch_get_physaddr_cellsize() : 1) + 1); + prop_used = (ncells + 1) * sizeof(ucell) * ofmem_arch_get_available_entry_size(ph) + 1; if (prop_used > *mem_prop_size) { @@ -325,28 +324,16 @@ size = r->start - start; if (size) { - if (ph == s_phandle_memory) { - /* physical address for /memory */ - ncells += ofmem_arch_encode_physaddr(&prop[ncells], start); - } else { - /* virtual address for MMU */ - prop[ncells++] = start; - } - prop[ncells++] = size; + ofmem_arch_create_available_entry(ph, &prop[ncells], start, size); + ncells += ofmem_arch_get_available_entry_size(ph); } start = r->start + r->size; } /* tail */ if (start < top_address) { - if (ph == s_phandle_memory) { - /* physical address for /memory */ - ncells += ofmem_arch_encode_physaddr(&prop[ncells], start); - } else { - /* virtual address for MMU */ - prop[ncells++] = start; - } - prop[ncells++] = top_address - start; + ofmem_arch_create_available_entry(ph, &prop[ncells], start, top_address - start); + ncells += ofmem_arch_get_available_entry_size(ph); } ofmem_set_property(ph, "available",

1 0

[PATCH 4/4] ppc: avoid runtime relocations
by Blue Swirl 31 Jan '11

31 Jan '11

Because the sizes of cells and pointers do not match on PPC64, relocations of an ucell array using the address of the array itself can't be computed by the linker. Use a fixed address on PPC64 for the array, so we can use a fixed ucell sized constant for the relocation offset. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> --- arch/ppc/build.xml | 6 +----- arch/ppc/qemu/kernel.c | 23 ++++++++++++++++++----- arch/ppc/qemu/ofmem.c | 2 +- arch/ppc64/qemu/ldscript | 7 +++++++ 4 files changed, 27 insertions(+), 11 deletions(-) diff --git a/arch/ppc/build.xml b/arch/ppc/build.xml index 4aec62f..8468799 100644 --- a/arch/ppc/build.xml +++ b/arch/ppc/build.xml @@ -60,11 +60,7 @@ <executable name="target/include/qemu-dict.h" target="target" condition="QEMU"> <rule><![CDATA[ - $(call quiet-command,true, " GEN $(TARGET_DIR)$@") - @echo "static const char forth_dictionary[] = {" > $@ - @cat $< | hexdump -ve '1/0 "\t" 8/1 "0x%02x, " 1/0 "\n"' \ - | sed 's/0x ,//g' >> $@ - @echo "};" >> $@]]></rule> + $(call quiet-command,$(ODIR)/forthstrap -x -D $@ -d $< </dev/null, " GEN $(TARGET_DIR)$@")]]></rule> <external-object source="openbios-qemu.dict"/> </executable> diff --git a/arch/ppc/qemu/kernel.c b/arch/ppc/qemu/kernel.c index 4cae525..b26fba5 100644 --- a/arch/ppc/qemu/kernel.c +++ b/arch/ppc/qemu/kernel.c @@ -17,7 +17,6 @@ * */ -#include "qemu-dict.h" #include "config.h" #include "dict.h" #include "libopenbios/bindings.h" @@ -27,7 +26,19 @@ #include "kernel.h" #define MEMORY_SIZE (256*1024) /* 256K ram for hosted system */ -#define DICTIONARY_SIZE (512*1024) /* 512K for the dictionary */ +/* 512K for the dictionary */ +#define DICTIONARY_SIZE (512 * 1024 / sizeof(ucell)) +#ifdef __powerpc64__ +#define DICTIONARY_BASE 0xfff08000 /* this must match the value in ldscript! */ +#define DICTIONARY_SECTION __attribute__((section(".data.dict"))) +#else +#define DICTIONARY_BASE ((ucell)((char *)&forth_dictionary)) +#define DICTIONARY_SECTION +#endif + +static ucell forth_dictionary[DICTIONARY_SIZE] DICTIONARY_SECTION = { +#include "qemu-dict.h" +}; static ucell *memory; @@ -82,10 +93,12 @@ init_memory( void ) int initialize_forth( void ) { - dict = malloc(DICTIONARY_SIZE); - dictlimit = DICTIONARY_SIZE; + dict = (unsigned char *)forth_dictionary; + dicthead = (ucell)FORTH_DICTIONARY_END; + last = (ucell *)((unsigned char *)forth_dictionary + + FORTH_DICTIONARY_LAST); + dictlimit = sizeof(forth_dictionary); - load_dictionary( forth_dictionary, sizeof(forth_dictionary) ); forth_init(); PUSH_xt( bind_noname_func(arch_of_init) ); diff --git a/arch/ppc/qemu/ofmem.c b/arch/ppc/qemu/ofmem.c index 4c6825e..f6cf8cd 100644 --- a/arch/ppc/qemu/ofmem.c +++ b/arch/ppc/qemu/ofmem.c @@ -55,7 +55,7 @@ extern void setup_mmu(unsigned long code_base); #define HASH_BITS 15 #endif #define HASH_SIZE (2 << HASH_BITS) -#define OFMEM_SIZE (2 * 1024 * 1024) +#define OFMEM_SIZE (1 * 1024 * 1024 + 512 * 1024) #define SEGR_USER BIT(2) #define SEGR_BASE 0x0400 diff --git a/arch/ppc64/qemu/ldscript b/arch/ppc64/qemu/ldscript index 7a22903..fbbcc54 100644 --- a/arch/ppc64/qemu/ldscript +++ b/arch/ppc64/qemu/ldscript @@ -6,6 +6,7 @@ OUTPUT_ARCH(powerpc:common64) BASE_ADDR = 0xfff00000; /* As NVRAM is at 0xfff04000, the .text needs to be after that + * The value in arch/ppc/qemu/kernel.c must match this value! */ TEXT_ADDR = 0xfff08000; @@ -26,6 +27,12 @@ SECTIONS . = TEXT_ADDR; /* Normal sections */ + .data.dict ALIGN(4096): { + _dict_start = .; + *(.data.dict) + _dict_end = .; + } + .text ALIGN(4096): { *(.text) *(.text.*) -- 1.6.2.4

5 6

[commit] r1018 - in trunk/openbios-devel/arch: ppc ppc/qemu ppc64/qemu
by repository service 30 Jan '11

30 Jan '11

Author: blueswirl Date: Sun Jan 30 14:07:40 2011 New Revision: 1018 URL: http://tracker.coreboot.org/trac/openbios/changeset/1018 Log: ppc: avoid runtime relocations Because the sizes of cells and pointers do not match on PPC64, relocations of an ucell array using the address of the array itself can't be computed by the linker. Use a fixed address on PPC64 for the array, so we can use a fixed ucell sized constant for the relocation offset. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/ppc/build.xml trunk/openbios-devel/arch/ppc/qemu/kernel.c trunk/openbios-devel/arch/ppc/qemu/ofmem.c trunk/openbios-devel/arch/ppc64/qemu/ldscript Modified: trunk/openbios-devel/arch/ppc/build.xml ============================================================================== --- trunk/openbios-devel/arch/ppc/build.xml Sun Jan 30 14:07:37 2011 (r1017) +++ trunk/openbios-devel/arch/ppc/build.xml Sun Jan 30 14:07:40 2011 (r1018) @@ -60,11 +60,7 @@ <executable name="target/include/qemu-dict.h" target="target" condition="QEMU"> <rule><![CDATA[ - $(call quiet-command,true, " GEN $(TARGET_DIR)$@") - @echo "static const char forth_dictionary[] = {" > $@ - @cat $< | hexdump -ve '1/0 "\t" 8/1 "0x%02x, " 1/0 "\n"' \ - | sed 's/0x ,//g' >> $@ - @echo "};" >> $@]]></rule> + $(call quiet-command,$(ODIR)/forthstrap -x -D $@ -d $< </dev/null, " GEN $(TARGET_DIR)$@")]]></rule> <external-object source="openbios-qemu.dict"/> </executable> Modified: trunk/openbios-devel/arch/ppc/qemu/kernel.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/kernel.c Sun Jan 30 14:07:37 2011 (r1017) +++ trunk/openbios-devel/arch/ppc/qemu/kernel.c Sun Jan 30 14:07:40 2011 (r1018) @@ -17,7 +17,6 @@ * */ -#include "qemu-dict.h" #include "config.h" #include "dict.h" #include "libopenbios/bindings.h" @@ -27,7 +26,19 @@ #include "kernel.h" #define MEMORY_SIZE (256*1024) /* 256K ram for hosted system */ -#define DICTIONARY_SIZE (512*1024) /* 512K for the dictionary */ +/* 512K for the dictionary */ +#define DICTIONARY_SIZE (512 * 1024 / sizeof(ucell)) +#ifdef __powerpc64__ +#define DICTIONARY_BASE 0xfff08000 /* this must match the value in ldscript! */ +#define DICTIONARY_SECTION __attribute__((section(".data.dict"))) +#else +#define DICTIONARY_BASE ((ucell)((char *)&forth_dictionary)) +#define DICTIONARY_SECTION +#endif + +static ucell forth_dictionary[DICTIONARY_SIZE] DICTIONARY_SECTION = { +#include "qemu-dict.h" +}; static ucell *memory; @@ -82,10 +93,12 @@ int initialize_forth( void ) { - dict = malloc(DICTIONARY_SIZE); - dictlimit = DICTIONARY_SIZE; + dict = (unsigned char *)forth_dictionary; + dicthead = (ucell)FORTH_DICTIONARY_END; + last = (ucell *)((unsigned char *)forth_dictionary + + FORTH_DICTIONARY_LAST); + dictlimit = sizeof(forth_dictionary); - load_dictionary( forth_dictionary, sizeof(forth_dictionary) ); forth_init(); PUSH_xt( bind_noname_func(arch_of_init) ); Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sun Jan 30 14:07:37 2011 (r1017) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sun Jan 30 14:07:40 2011 (r1018) @@ -55,7 +55,7 @@ #define HASH_BITS 15 #endif #define HASH_SIZE (2 << HASH_BITS) -#define OFMEM_SIZE (2 * 1024 * 1024) +#define OFMEM_SIZE (1 * 1024 * 1024 + 512 * 1024) #define SEGR_USER BIT(2) #define SEGR_BASE 0x0400 Modified: trunk/openbios-devel/arch/ppc64/qemu/ldscript ============================================================================== --- trunk/openbios-devel/arch/ppc64/qemu/ldscript Sun Jan 30 14:07:37 2011 (r1017) +++ trunk/openbios-devel/arch/ppc64/qemu/ldscript Sun Jan 30 14:07:40 2011 (r1018) @@ -6,6 +6,7 @@ BASE_ADDR = 0xfff00000; /* As NVRAM is at 0xfff04000, the .text needs to be after that + * The value in arch/ppc/qemu/kernel.c must match this value! */ TEXT_ADDR = 0xfff08000; @@ -26,6 +27,12 @@ . = TEXT_ADDR; /* Normal sections */ + .data.dict ALIGN(4096): { + _dict_start = .; + *(.data.dict) + _dict_end = .; + } + .text ALIGN(4096): { *(.text) *(.text.*)

1 0

[commit] r1017 - trunk/openbios-devel/arch/x86
by repository service 30 Jan '11

30 Jan '11

Author: blueswirl Date: Sun Jan 30 14:07:37 2011 New Revision: 1017 URL: http://tracker.coreboot.org/trac/openbios/changeset/1017 Log: x86: avoid runtime relocations Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/x86/build.xml trunk/openbios-devel/arch/x86/builtin.c trunk/openbios-devel/arch/x86/openbios.c Modified: trunk/openbios-devel/arch/x86/build.xml ============================================================================== --- trunk/openbios-devel/arch/x86/build.xml Sun Jan 30 14:07:34 2011 (r1016) +++ trunk/openbios-devel/arch/x86/build.xml Sun Jan 30 14:07:37 2011 (r1017) @@ -55,11 +55,7 @@ <executable name="target/include/static-dict.h" target="target" condition="IMAGE_ELF_EMBEDDED"> <rule><![CDATA[ - $(call quiet-command,true, " GEN $(TARGET_DIR)$@") - @echo "static const char forth_dictionary[] = {" > $@ - @cat $< | hexdump -ve '1/0 "\t" 8/1 "0x%02x, " 1/0 "\n"' \ - | sed 's/0x ,//g' >> $@ - @echo "};" >> $@]]></rule> + $(call quiet-command,$(ODIR)/forthstrap -x -D $@ -d $< </dev/null, " GEN $(TARGET_DIR)$@")]]></rule> <external-object source="openbios-x86.dict"/> </executable> Modified: trunk/openbios-devel/arch/x86/builtin.c ============================================================================== --- trunk/openbios-devel/arch/x86/builtin.c Sun Jan 30 14:07:34 2011 (r1016) +++ trunk/openbios-devel/arch/x86/builtin.c Sun Jan 30 14:07:37 2011 (r1017) @@ -13,12 +13,20 @@ * wrap an array around the hex'ed dictionary file */ +/* 256K for the dictionary */ +#define DICTIONARY_SIZE (256 * 1024 / sizeof(ucell)) +#define DICTIONARY_BASE ((ucell)((char *)&forth_dictionary)) + +static ucell forth_dictionary[DICTIONARY_SIZE] = { #include "static-dict.h" +}; void collect_multiboot_info(struct sys_info *info); void collect_multiboot_info(struct sys_info *info) { info->dict_start=(unsigned long *)forth_dictionary; - info->dict_end=(unsigned long *)((ucell)forth_dictionary + - sizeof(forth_dictionary)); + info->dict_end = (unsigned long *)FORTH_DICTIONARY_END; + info->dict_last = (ucell *)((unsigned char *)forth_dictionary + + FORTH_DICTIONARY_LAST); + info->dict_limit = sizeof(forth_dictionary); } Modified: trunk/openbios-devel/arch/x86/openbios.c ============================================================================== --- trunk/openbios-devel/arch/x86/openbios.c Sun Jan 30 14:07:34 2011 (r1016) +++ trunk/openbios-devel/arch/x86/openbios.c Sun Jan 30 14:07:37 2011 (r1017) @@ -22,9 +22,6 @@ void collect_sys_info(struct sys_info *info); -#define DICTIONARY_SIZE (256*1024) /* 256K for the dictionary */ -static unsigned char intdict[DICTIONARY_SIZE]; - #ifdef CONFIG_DRIVER_PCI static const pci_arch_t default_pci_host = { .name = "Intel,i440FX", @@ -84,12 +81,11 @@ collect_sys_info(&sys_info); - dict=intdict; - dictlimit = DICTIONARY_SIZE; + dict = (unsigned char *)sys_info.dict_start; + dicthead = (cell)sys_info.dict_end; + last = sys_info.dict_last; + dictlimit = sys_info.dict_limit; - load_dictionary((char *)sys_info.dict_start, - (unsigned long)sys_info.dict_end - - (unsigned long)sys_info.dict_start); forth_init(); relocate(&sys_info);

1 0

[commit] r1016 - trunk/openbios-devel/arch/sparc64
by repository service 30 Jan '11

30 Jan '11

Author: blueswirl Date: Sun Jan 30 14:07:34 2011 New Revision: 1016 URL: http://tracker.coreboot.org/trac/openbios/changeset/1016 Log: sparc64: avoid runtime relocations Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc64/build.xml trunk/openbios-devel/arch/sparc64/builtin.c trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c trunk/openbios-devel/arch/sparc64/openbios.c Modified: trunk/openbios-devel/arch/sparc64/build.xml ============================================================================== --- trunk/openbios-devel/arch/sparc64/build.xml Sun Jan 30 14:07:31 2011 (r1015) +++ trunk/openbios-devel/arch/sparc64/build.xml Sun Jan 30 14:07:34 2011 (r1016) @@ -40,11 +40,7 @@ <executable name="target/include/static-dict.h" target="target" condition="IMAGE_ELF_EMBEDDED"> <rule><![CDATA[ - $(call quiet-command,true, " GEN $(TARGET_DIR)$@") - @echo "static const char forth_dictionary[] = {" > $@ - @cat $< | hexdump -ve '1/0 "\t" 8/1 "0x%02x, " 1/0 "\n"' \ - | sed 's/0x ,//g' >> $@ - @echo "};" >> $@]]></rule> + $(call quiet-command,$(ODIR)/forthstrap -x -D $@ -d $< </dev/null, " GEN $(TARGET_DIR)$@")]]></rule> <external-object source="openbios-sparc64.dict"/> </executable> Modified: trunk/openbios-devel/arch/sparc64/builtin.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/builtin.c Sun Jan 30 14:07:31 2011 (r1015) +++ trunk/openbios-devel/arch/sparc64/builtin.c Sun Jan 30 14:07:34 2011 (r1016) @@ -14,12 +14,20 @@ * wrap an array around the hex'ed dictionary file */ +/* 512K for the dictionary */ +#define DICTIONARY_SIZE (512 * 1024 / sizeof(ucell)) +#define DICTIONARY_BASE ((ucell)((char *)&forth_dictionary)) + +static ucell forth_dictionary[DICTIONARY_SIZE] = { #include "static-dict.h" +}; void collect_multiboot_info(struct sys_info *info); void collect_multiboot_info(struct sys_info *info) { info->dict_start=(unsigned long *)forth_dictionary; - info->dict_end=(unsigned long *)((ucell)forth_dictionary + - sizeof(forth_dictionary)); + info->dict_end = (unsigned long *)FORTH_DICTIONARY_END; + info->dict_last = (ucell *)((unsigned char *)forth_dictionary + + FORTH_DICTIONARY_LAST); + info->dict_limit = sizeof(forth_dictionary); } Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Sun Jan 30 14:07:31 2011 (r1015) +++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Sun Jan 30 14:07:34 2011 (r1016) @@ -20,7 +20,7 @@ #define OF_MALLOC_BASE ((char*)OFMEM + ALIGN_SIZE(sizeof(ofmem_t), 8)) -#define MEMSIZE ((256 + 512 + 512) * 1024) +#define MEMSIZE ((256 + 512) * 1024) static union { char memory[MEMSIZE]; ofmem_t ofmem; Modified: trunk/openbios-devel/arch/sparc64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c Sun Jan 30 14:07:31 2011 (r1015) +++ trunk/openbios-devel/arch/sparc64/openbios.c Sun Jan 30 14:07:34 2011 (r1016) @@ -33,7 +33,6 @@ #define APB_MEM_BASE 0x1ff00000000ULL #define MEMORY_SIZE (512*1024) /* 512K ram for hosted system */ -#define DICTIONARY_SIZE (512*1024) /* 512K for the dictionary */ static ucell *memory; @@ -617,12 +616,11 @@ collect_sys_info(&sys_info); - dict = malloc(DICTIONARY_SIZE); - dictlimit = DICTIONARY_SIZE; + dict = (unsigned char *)sys_info.dict_start; + dicthead = (cell)sys_info.dict_end; + last = sys_info.dict_last; + dictlimit = sys_info.dict_limit; - load_dictionary((char *)sys_info.dict_start, - (unsigned long)sys_info.dict_end - - (unsigned long)sys_info.dict_start); forth_init(); #ifdef CONFIG_DEBUG_BOOT

1 0

[commit] r1015 - in trunk/openbios-devel: arch/sparc32 include/libopenbios kernel
by repository service 30 Jan '11

30 Jan '11

Author: blueswirl Date: Sun Jan 30 14:07:31 2011 New Revision: 1015 URL: http://tracker.coreboot.org/trac/openbios/changeset/1015 Log: sparc32: avoid runtime relocations The Forth dictionary was relocated at run time, incurring also a copy operation. The source dictionary remained in memory. It was not possible to run forthstrap without any input files besides the base dictionary. Make forthstrap generate a hex dump which can be included in C, but also contains relocations, so that relocations are performed by the linker at compile time. Allow dictionary compilation with no source files. Don't allocate the dictionary dynamically; reduce ofmem supply accordingly. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc32/build.xml trunk/openbios-devel/arch/sparc32/builtin.c trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c trunk/openbios-devel/arch/sparc32/openbios.c trunk/openbios-devel/include/libopenbios/sys_info.h trunk/openbios-devel/kernel/bootstrap.c Modified: trunk/openbios-devel/arch/sparc32/build.xml ============================================================================== --- trunk/openbios-devel/arch/sparc32/build.xml Sat Jan 8 20:44:38 2011 (r1014) +++ trunk/openbios-devel/arch/sparc32/build.xml Sun Jan 30 14:07:31 2011 (r1015) @@ -42,11 +42,7 @@ <executable name="target/include/static-dict.h" target="target" condition="IMAGE_ELF_EMBEDDED"> <rule><![CDATA[ - $(call quiet-command,true, " GEN $(TARGET_DIR)$@") - @echo "static const char forth_dictionary[] = {" > $@ - @cat $< | hexdump -ve '1/0 "\t" 8/1 "0x%02x, " 1/0 "\n"' \ - | sed 's/0x ,//g' >> $@ - @echo "};" >> $@]]></rule> + $(call quiet-command,$(ODIR)/forthstrap -x -D $@ -d $< </dev/null, " GEN $(TARGET_DIR)$@")]]></rule> <external-object source="openbios-sparc32.dict"/> </executable> Modified: trunk/openbios-devel/arch/sparc32/builtin.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/builtin.c Sat Jan 8 20:44:38 2011 (r1014) +++ trunk/openbios-devel/arch/sparc32/builtin.c Sun Jan 30 14:07:31 2011 (r1015) @@ -14,12 +14,20 @@ * wrap an array around the hex'ed dictionary file */ +/* 256K for the dictionary */ +#define DICTIONARY_SIZE (256 * 1024 / sizeof(ucell)) +#define DICTIONARY_BASE ((ucell)((char *)&forth_dictionary)) + +static ucell forth_dictionary[DICTIONARY_SIZE] = { #include "static-dict.h" +}; void collect_multiboot_info(struct sys_info *info); void collect_multiboot_info(struct sys_info *info) { info->dict_start=(unsigned long *)forth_dictionary; - info->dict_end=(unsigned long *)((ucell)forth_dictionary + - sizeof(forth_dictionary)); + info->dict_end = (unsigned long *)FORTH_DICTIONARY_END; + info->dict_last = (ucell *)((unsigned char *)forth_dictionary + + FORTH_DICTIONARY_LAST); + info->dict_limit = sizeof(forth_dictionary); } Modified: trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c Sat Jan 8 20:44:38 2011 (r1014) +++ trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c Sun Jan 30 14:07:31 2011 (r1015) @@ -21,7 +21,7 @@ #define OF_MALLOC_BASE ((char*)OFMEM + ALIGN_SIZE(sizeof(ofmem_t), 8)) -#define MEMSIZE (512 * 1024) +#define MEMSIZE (256 * 1024) static union { char memory[MEMSIZE]; ofmem_t ofmem; Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Sat Jan 8 20:44:38 2011 (r1014) +++ trunk/openbios-devel/arch/sparc32/openbios.c Sun Jan 30 14:07:31 2011 (r1015) @@ -28,7 +28,6 @@ #include "libopenbios/ofmem.h" #define MEMORY_SIZE (16*1024) /* 16K ram for hosted system */ -#define DICTIONARY_SIZE (256*1024) /* 256K for the dictionary */ #define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" #define FW_CFG_SUN4M_DEPTH (FW_CFG_ARCH_LOCAL + 0x00) @@ -968,12 +967,11 @@ collect_sys_info(&sys_info); - dict = malloc(DICTIONARY_SIZE); - dictlimit = DICTIONARY_SIZE; + dict = (unsigned char *)sys_info.dict_start; + dicthead = (cell)sys_info.dict_end; + last = sys_info.dict_last; + dictlimit = sys_info.dict_limit; - load_dictionary((char *)sys_info.dict_start, - (unsigned long)sys_info.dict_end - - (unsigned long)sys_info.dict_start); forth_init(); #ifdef CONFIG_DEBUG_BOOT Modified: trunk/openbios-devel/include/libopenbios/sys_info.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/sys_info.h Sat Jan 8 20:44:38 2011 (r1014) +++ trunk/openbios-devel/include/libopenbios/sys_info.h Sun Jan 30 14:07:31 2011 (r1015) @@ -20,6 +20,8 @@ } *memrange; unsigned long *dict_start; unsigned long *dict_end; + cell dict_limit; + ucell *dict_last; }; extern void *elf_boot_notes; Modified: trunk/openbios-devel/kernel/bootstrap.c ============================================================================== --- trunk/openbios-devel/kernel/bootstrap.c Sat Jan 8 20:44:38 2011 (r1014) +++ trunk/openbios-devel/kernel/bootstrap.c Sun Jan 30 14:07:31 2011 (r1015) @@ -96,6 +96,11 @@ * dictionary related functions. */ +/* + * Compare two dictionaries constructed at different addresses. When + * the cells don't match, a need for relocation is detected and the + * corresponding bit in reloc_table bitmap is set. + */ static void relocation_table(unsigned char * dict_one, unsigned char *dict_two, int length) { ucell *d1=(ucell *)dict_one, *d2=(ucell *)dict_two; @@ -237,6 +242,54 @@ #endif } +/* + * Write dictionary as a list of ucell hex values to filename. Array + * header and end lines are not generated. + * + * Cells with relocations are output using the expression + * DICTIONARY_BASE + value. + * + * Define some helpful constants. + */ +static void write_dictionary_hex(const char *filename) +{ + FILE *f; + ucell *walk; + + f = fopen(filename, "w"); + if (!f) { + printk("panic: can't write to dictionary '%s'.\n", filename); + exit(1); + } + + for (walk = (ucell *)dict; walk < (ucell *)(dict + dicthead); walk++) { + int pos, bit, l; + ucell val; + + l = (walk - (ucell *)dict); + pos = l / BITS; + bit = l & ~(-BITS); + + val = read_ucell(walk); + if (relocation_address[pos] & target_ucell((ucell)1ULL << bit)) { + fprintf(f, "DICTIONARY_BASE + 0x%" FMT_CELL_x + ",\n", val); + } else { + fprintf(f, "0x%" FMT_CELL_x",\n", val); + } + } + + fprintf(f, "#define FORTH_DICTIONARY_LAST 0x%" FMT_CELL_x"\n", + (ucell)((unsigned long)last - (unsigned long)dict)); + fprintf(f, "#define FORTH_DICTIONARY_END 0x%" FMT_CELL_x"\n", + (ucell)dicthead); + fclose(f); + +#ifdef CONFIG_DEBUG_DICTIONARY + printk("wrote dictionary to file %s.\n", filename); +#endif +} + static ucell read_dictionary(char *fil) { int ilen; @@ -1032,7 +1085,8 @@ " write kernel console output to log file\n" \ " -s|--segfault install segfault handler\n" \ " -M|--dependency-dump file\n" \ - " dump dependencies in Makefile format\n\n" + " dump dependencies in Makefile format\n\n" \ + " -x|--hexdump output format is C language hex dump\n" #else #define USAGE "Usage: %s [options] [dictionary file|source file]\n\n" \ " -h show this help\n" \ @@ -1045,8 +1099,9 @@ " write to output.dict\n" \ " -c output.log\n" \ " write kernel console output to log file\n" \ - " -s install segfault handler\n\n" - " -M file dump dependencies in Makefile format\n\n" + " -s install segfault handler\n\n" \ + " -M file dump dependencies in Makefile format\n\n" \ + " -x output format is C language hex dump\n" #endif int main(int argc, char *argv[]) @@ -1054,15 +1109,15 @@ struct sigaction sa; unsigned char *ressources=NULL; /* All memory used by us */ - char *dictname = NULL; + const char *dictname = NULL; char *basedict = NULL; char *consolefile = NULL; char *depfilename = NULL; unsigned char *bootstrapdict[2]; - int c, cnt; + int c, cnt, hexdump = 0; - const char *optstring = "VvhsI:d:D:c:M:?"; + const char *optstring = "VvhsI:d:D:c:M:x?"; while (1) { #ifdef __GLIBC__ @@ -1077,6 +1132,7 @@ {"target-dictionary", 1, NULL, 'D'}, {"console", 1, NULL, 'c'}, {"dependency-dump", 1, NULL, 'M'}, + {"hexdump", 0, NULL, 'x'}, }; /* @@ -1132,11 +1188,17 @@ depfilename = optarg; } break; + case 'x': + hexdump = 1; + break; default: return 1; } } + if (!dictname) { + dictname = "bootstrap.dict"; + } if (verbose) { printk(BANNER); printk("Using source dictionary '%s'\n", basedict); @@ -1144,7 +1206,7 @@ printk("Dumping dependencies to '%s'\n", depfilename); } - if (argc < optind + 1) { + if (argc < optind) { printk(USAGE, argv[0]); return 1; } @@ -1243,7 +1305,11 @@ #endif { relocation_table( bootstrapdict[0], bootstrapdict[1], dicthead); - write_dictionary( dictname ? dictname : "bootstrap.dict"); + if (hexdump) { + write_dictionary_hex(dictname); + } else { + write_dictionary(dictname); + } } free(ressources);

1 0

[PATCH 0/4] Avoid runtime relocations v2
by Blue Swirl 26 Jan '11

26 Jan '11

I changed dictionary array cells' relocation expression to a more flexible one and moved the array header so that the ELF section of the array can be adjusted on PPC64. Now all architectures use the same methods. AMD64-unix, Sparc32, Sparc64, PPC32 and PPC64 seem to work. Blue Swirl (4): sparc32: avoid runtime relocations sparc64: avoid runtime relocations x86: avoid runtime relocations ppc: avoid runtime relocations arch/ppc/build.xml | 6 +-- arch/ppc/qemu/kernel.c | 23 +++++++++-- arch/ppc/qemu/ofmem.c | 2 +- arch/ppc64/qemu/ldscript | 7 +++ arch/sparc32/build.xml | 6 +-- arch/sparc32/builtin.c | 12 +++++- arch/sparc32/ofmem_sparc32.c | 2 +- arch/sparc32/openbios.c | 10 ++--- arch/sparc64/build.xml | 6 +-- arch/sparc64/builtin.c | 12 +++++- arch/sparc64/ofmem_sparc64.c | 2 +- arch/sparc64/openbios.c | 10 ++--- arch/x86/build.xml | 6 +-- arch/x86/builtin.c | 12 +++++- arch/x86/openbios.c | 12 ++---- include/libopenbios/sys_info.h | 2 + kernel/bootstrap.c | 82 ++++++++++++++++++++++++++++++++++++---- 17 files changed, 150 insertions(+), 62 deletions(-)

2 1

[PATCH 3/4] x86: avoid runtime relocations
by Blue Swirl 23 Jan '11

23 Jan '11

Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> --- arch/x86/build.xml | 6 +----- arch/x86/builtin.c | 12 ++++++++++-- arch/x86/openbios.c | 12 ++++-------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/arch/x86/build.xml b/arch/x86/build.xml index 8317209..02cecce 100644 --- a/arch/x86/build.xml +++ b/arch/x86/build.xml @@ -55,11 +55,7 @@ <executable name="target/include/static-dict.h" target="target" condition="IMAGE_ELF_EMBEDDED"> <rule><![CDATA[ - $(call quiet-command,true, " GEN $(TARGET_DIR)$@") - @echo "static const char forth_dictionary[] = {" > $@ - @cat $< | hexdump -ve '1/0 "\t" 8/1 "0x%02x, " 1/0 "\n"' \ - | sed 's/0x ,//g' >> $@ - @echo "};" >> $@]]></rule> + $(call quiet-command,$(ODIR)/forthstrap -x -D $@ -d $< </dev/null, " GEN $(TARGET_DIR)$@")]]></rule> <external-object source="openbios-x86.dict"/> </executable> diff --git a/arch/x86/builtin.c b/arch/x86/builtin.c index a649172..f7d8aba 100644 --- a/arch/x86/builtin.c +++ b/arch/x86/builtin.c @@ -13,12 +13,20 @@ * wrap an array around the hex'ed dictionary file */ +/* 256K for the dictionary */ +#define DICTIONARY_SIZE (256 * 1024 / sizeof(ucell)) +#define DICTIONARY_BASE ((ucell)((char *)&forth_dictionary)) + +static ucell forth_dictionary[DICTIONARY_SIZE] = { #include "static-dict.h" +}; void collect_multiboot_info(struct sys_info *info); void collect_multiboot_info(struct sys_info *info) { info->dict_start=(unsigned long *)forth_dictionary; - info->dict_end=(unsigned long *)((ucell)forth_dictionary + - sizeof(forth_dictionary)); + info->dict_end = (unsigned long *)FORTH_DICTIONARY_END; + info->dict_last = (ucell *)((unsigned char *)forth_dictionary + + FORTH_DICTIONARY_LAST); + info->dict_limit = sizeof(forth_dictionary); } diff --git a/arch/x86/openbios.c b/arch/x86/openbios.c index 24b886d..dd444fa 100644 --- a/arch/x86/openbios.c +++ b/arch/x86/openbios.c @@ -22,9 +22,6 @@ void collect_sys_info(struct sys_info *info); -#define DICTIONARY_SIZE (256*1024) /* 256K for the dictionary */ -static unsigned char intdict[DICTIONARY_SIZE]; - #ifdef CONFIG_DRIVER_PCI static const pci_arch_t default_pci_host = { .name = "Intel,i440FX", @@ -84,12 +81,11 @@ int openbios(void) collect_sys_info(&sys_info); - dict=intdict; - dictlimit = DICTIONARY_SIZE; + dict = (unsigned char *)sys_info.dict_start; + dicthead = (cell)sys_info.dict_end; + last = sys_info.dict_last; + dictlimit = sys_info.dict_limit; - load_dictionary((char *)sys_info.dict_start, - (unsigned long)sys_info.dict_end - - (unsigned long)sys_info.dict_start); forth_init(); relocate(&sys_info); -- 1.6.2.4

1 0

[PATCH 2/4] sparc64: avoid runtime relocations
by Blue Swirl 23 Jan '11

23 Jan '11

Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> --- arch/sparc64/build.xml | 6 +----- arch/sparc64/builtin.c | 12 ++++++++++-- arch/sparc64/ofmem_sparc64.c | 2 +- arch/sparc64/openbios.c | 10 ++++------ 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/arch/sparc64/build.xml b/arch/sparc64/build.xml index 3bea63c..54807c5 100644 --- a/arch/sparc64/build.xml +++ b/arch/sparc64/build.xml @@ -40,11 +40,7 @@ <executable name="target/include/static-dict.h" target="target" condition="IMAGE_ELF_EMBEDDED"> <rule><![CDATA[ - $(call quiet-command,true, " GEN $(TARGET_DIR)$@") - @echo "static const char forth_dictionary[] = {" > $@ - @cat $< | hexdump -ve '1/0 "\t" 8/1 "0x%02x, " 1/0 "\n"' \ - | sed 's/0x ,//g' >> $@ - @echo "};" >> $@]]></rule> + $(call quiet-command,$(ODIR)/forthstrap -x -D $@ -d $< </dev/null, " GEN $(TARGET_DIR)$@")]]></rule> <external-object source="openbios-sparc64.dict"/> </executable> diff --git a/arch/sparc64/builtin.c b/arch/sparc64/builtin.c index aba8a2b..864da79 100644 --- a/arch/sparc64/builtin.c +++ b/arch/sparc64/builtin.c @@ -14,12 +14,20 @@ * wrap an array around the hex'ed dictionary file */ +/* 512K for the dictionary */ +#define DICTIONARY_SIZE (512 * 1024 / sizeof(ucell)) +#define DICTIONARY_BASE ((ucell)((char *)&forth_dictionary)) + +static ucell forth_dictionary[DICTIONARY_SIZE] = { #include "static-dict.h" +}; void collect_multiboot_info(struct sys_info *info); void collect_multiboot_info(struct sys_info *info) { info->dict_start=(unsigned long *)forth_dictionary; - info->dict_end=(unsigned long *)((ucell)forth_dictionary + - sizeof(forth_dictionary)); + info->dict_end = (unsigned long *)FORTH_DICTIONARY_END; + info->dict_last = (ucell *)((unsigned char *)forth_dictionary + + FORTH_DICTIONARY_LAST); + info->dict_limit = sizeof(forth_dictionary); } diff --git a/arch/sparc64/ofmem_sparc64.c b/arch/sparc64/ofmem_sparc64.c index 1655978..1ed4a7a 100644 --- a/arch/sparc64/ofmem_sparc64.c +++ b/arch/sparc64/ofmem_sparc64.c @@ -20,7 +20,7 @@ #define OF_MALLOC_BASE ((char*)OFMEM + ALIGN_SIZE(sizeof(ofmem_t), 8)) -#define MEMSIZE ((256 + 512 + 512) * 1024) +#define MEMSIZE ((256 + 512) * 1024) static union { char memory[MEMSIZE]; ofmem_t ofmem; diff --git a/arch/sparc64/openbios.c b/arch/sparc64/openbios.c index 8c08814..ac709fe 100644 --- a/arch/sparc64/openbios.c +++ b/arch/sparc64/openbios.c @@ -33,7 +33,6 @@ #define APB_MEM_BASE 0x1ff00000000ULL #define MEMORY_SIZE (512*1024) /* 512K ram for hosted system */ -#define DICTIONARY_SIZE (512*1024) /* 512K for the dictionary */ static ucell *memory; @@ -617,12 +616,11 @@ int openbios(void) collect_sys_info(&sys_info); - dict = malloc(DICTIONARY_SIZE); - dictlimit = DICTIONARY_SIZE; + dict = (unsigned char *)sys_info.dict_start; + dicthead = (cell)sys_info.dict_end; + last = sys_info.dict_last; + dictlimit = sys_info.dict_limit; - load_dictionary((char *)sys_info.dict_start, - (unsigned long)sys_info.dict_end - - (unsigned long)sys_info.dict_start); forth_init(); #ifdef CONFIG_DEBUG_BOOT -- 1.6.2.4

1 0

[PATCH 1/4] sparc32: avoid runtime relocations
by Blue Swirl 23 Jan '11

23 Jan '11

The Forth dictionary was relocated at run time, incurring also a copy operation. The source dictionary remained in memory. It was not possible to run forthstrap without any input files besides the base dictionary. Make forthstrap generate a hex dump which can be included in C, but also contains relocations, so that relocations are performed by the linker at compile time. Allow dictionary compilation with no source files. Don't allocate the dictionary dynamically; reduce ofmem supply accordingly. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> --- arch/sparc32/build.xml | 6 +-- arch/sparc32/builtin.c | 12 +++++- arch/sparc32/ofmem_sparc32.c | 2 +- arch/sparc32/openbios.c | 10 ++--- include/libopenbios/sys_info.h | 2 + kernel/bootstrap.c | 82 ++++++++++++++++++++++++++++++++++++---- 6 files changed, 92 insertions(+), 22 deletions(-) diff --git a/arch/sparc32/build.xml b/arch/sparc32/build.xml index 3d2f71d..47ad01a 100644 --- a/arch/sparc32/build.xml +++ b/arch/sparc32/build.xml @@ -42,11 +42,7 @@ <executable name="target/include/static-dict.h" target="target" condition="IMAGE_ELF_EMBEDDED"> <rule><![CDATA[ - $(call quiet-command,true, " GEN $(TARGET_DIR)$@") - @echo "static const char forth_dictionary[] = {" > $@ - @cat $< | hexdump -ve '1/0 "\t" 8/1 "0x%02x, " 1/0 "\n"' \ - | sed 's/0x ,//g' >> $@ - @echo "};" >> $@]]></rule> + $(call quiet-command,$(ODIR)/forthstrap -x -D $@ -d $< </dev/null, " GEN $(TARGET_DIR)$@")]]></rule> <external-object source="openbios-sparc32.dict"/> </executable> diff --git a/arch/sparc32/builtin.c b/arch/sparc32/builtin.c index 8bcce4c..971a400 100644 --- a/arch/sparc32/builtin.c +++ b/arch/sparc32/builtin.c @@ -14,12 +14,20 @@ * wrap an array around the hex'ed dictionary file */ +/* 256K for the dictionary */ +#define DICTIONARY_SIZE (256 * 1024 / sizeof(ucell)) +#define DICTIONARY_BASE ((ucell)((char *)&forth_dictionary)) + +static ucell forth_dictionary[DICTIONARY_SIZE] = { #include "static-dict.h" +}; void collect_multiboot_info(struct sys_info *info); void collect_multiboot_info(struct sys_info *info) { info->dict_start=(unsigned long *)forth_dictionary; - info->dict_end=(unsigned long *)((ucell)forth_dictionary + - sizeof(forth_dictionary)); + info->dict_end = (unsigned long *)FORTH_DICTIONARY_END; + info->dict_last = (ucell *)((unsigned char *)forth_dictionary + + FORTH_DICTIONARY_LAST); + info->dict_limit = sizeof(forth_dictionary); } diff --git a/arch/sparc32/ofmem_sparc32.c b/arch/sparc32/ofmem_sparc32.c index 6815349..72079b2 100644 --- a/arch/sparc32/ofmem_sparc32.c +++ b/arch/sparc32/ofmem_sparc32.c @@ -21,7 +21,7 @@ #define OF_MALLOC_BASE ((char*)OFMEM + ALIGN_SIZE(sizeof(ofmem_t), 8)) -#define MEMSIZE (512 * 1024) +#define MEMSIZE (256 * 1024) static union { char memory[MEMSIZE]; ofmem_t ofmem; diff --git a/arch/sparc32/openbios.c b/arch/sparc32/openbios.c index c940a5f..1d8842a 100644 --- a/arch/sparc32/openbios.c +++ b/arch/sparc32/openbios.c @@ -28,7 +28,6 @@ #include "libopenbios/ofmem.h" #define MEMORY_SIZE (16*1024) /* 16K ram for hosted system */ -#define DICTIONARY_SIZE (256*1024) /* 256K for the dictionary */ #define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" #define FW_CFG_SUN4M_DEPTH (FW_CFG_ARCH_LOCAL + 0x00) @@ -968,12 +967,11 @@ int openbios(void) collect_sys_info(&sys_info); - dict = malloc(DICTIONARY_SIZE); - dictlimit = DICTIONARY_SIZE; + dict = (unsigned char *)sys_info.dict_start; + dicthead = (cell)sys_info.dict_end; + last = sys_info.dict_last; + dictlimit = sys_info.dict_limit; - load_dictionary((char *)sys_info.dict_start, - (unsigned long)sys_info.dict_end - - (unsigned long)sys_info.dict_start); forth_init(); #ifdef CONFIG_DEBUG_BOOT diff --git a/include/libopenbios/sys_info.h b/include/libopenbios/sys_info.h index 2eea9af..a8b3cce 100644 --- a/include/libopenbios/sys_info.h +++ b/include/libopenbios/sys_info.h @@ -20,6 +20,8 @@ struct sys_info { } *memrange; unsigned long *dict_start; unsigned long *dict_end; + cell dict_limit; + ucell *dict_last; }; extern void *elf_boot_notes; diff --git a/kernel/bootstrap.c b/kernel/bootstrap.c index 94aaeb8..546ffee 100644 --- a/kernel/bootstrap.c +++ b/kernel/bootstrap.c @@ -96,6 +96,11 @@ static const char *wordnames[] = { * dictionary related functions. */ +/* + * Compare two dictionaries constructed at different addresses. When + * the cells don't match, a need for relocation is detected and the + * corresponding bit in reloc_table bitmap is set. + */ static void relocation_table(unsigned char * dict_one, unsigned char *dict_two, int length) { ucell *d1=(ucell *)dict_one, *d2=(ucell *)dict_two; @@ -237,6 +242,54 @@ static void write_dictionary(const char *filename) #endif } +/* + * Write dictionary as a list of ucell hex values to filename. Array + * header and end lines are not generated. + * + * Cells with relocations are output using the expression + * DICTIONARY_BASE + value. + * + * Define some helpful constants. + */ +static void write_dictionary_hex(const char *filename) +{ + FILE *f; + ucell *walk; + + f = fopen(filename, "w"); + if (!f) { + printk("panic: can't write to dictionary '%s'.\n", filename); + exit(1); + } + + for (walk = (ucell *)dict; walk < (ucell *)(dict + dicthead); walk++) { + int pos, bit, l; + ucell val; + + l = (walk - (ucell *)dict); + pos = l / BITS; + bit = l & ~(-BITS); + + val = read_ucell(walk); + if (relocation_address[pos] & target_ucell((ucell)1ULL << bit)) { + fprintf(f, "DICTIONARY_BASE + 0x%" FMT_CELL_x + ",\n", val); + } else { + fprintf(f, "0x%" FMT_CELL_x",\n", val); + } + } + + fprintf(f, "#define FORTH_DICTIONARY_LAST 0x%" FMT_CELL_x"\n", + (ucell)((unsigned long)last - (unsigned long)dict)); + fprintf(f, "#define FORTH_DICTIONARY_END 0x%" FMT_CELL_x"\n", + (ucell)dicthead); + fclose(f); + +#ifdef CONFIG_DEBUG_DICTIONARY + printk("wrote dictionary to file %s.\n", filename); +#endif +} + static ucell read_dictionary(char *fil) { int ilen; @@ -1032,7 +1085,8 @@ static void new_dictionary(const char *source) " write kernel console output to log file\n" \ " -s|--segfault install segfault handler\n" \ " -M|--dependency-dump file\n" \ - " dump dependencies in Makefile format\n\n" + " dump dependencies in Makefile format\n\n" \ + " -x|--hexdump output format is C language hex dump\n" #else #define USAGE "Usage: %s [options] [dictionary file|source file]\n\n" \ " -h show this help\n" \ @@ -1045,8 +1099,9 @@ static void new_dictionary(const char *source) " write to output.dict\n" \ " -c output.log\n" \ " write kernel console output to log file\n" \ - " -s install segfault handler\n\n" - " -M file dump dependencies in Makefile format\n\n" + " -s install segfault handler\n\n" \ + " -M file dump dependencies in Makefile format\n\n" \ + " -x output format is C language hex dump\n" #endif int main(int argc, char *argv[]) @@ -1054,15 +1109,15 @@ int main(int argc, char *argv[]) struct sigaction sa; unsigned char *ressources=NULL; /* All memory used by us */ - char *dictname = NULL; + const char *dictname = NULL; char *basedict = NULL; char *consolefile = NULL; char *depfilename = NULL; unsigned char *bootstrapdict[2]; - int c, cnt; + int c, cnt, hexdump = 0; - const char *optstring = "VvhsI:d:D:c:M:?"; + const char *optstring = "VvhsI:d:D:c:M:x?"; while (1) { #ifdef __GLIBC__ @@ -1077,6 +1132,7 @@ int main(int argc, char *argv[]) {"target-dictionary", 1, NULL, 'D'}, {"console", 1, NULL, 'c'}, {"dependency-dump", 1, NULL, 'M'}, + {"hexdump", 0, NULL, 'x'}, }; /* @@ -1132,11 +1188,17 @@ int main(int argc, char *argv[]) depfilename = optarg; } break; + case 'x': + hexdump = 1; + break; default: return 1; } } + if (!dictname) { + dictname = "bootstrap.dict"; + } if (verbose) { printk(BANNER); printk("Using source dictionary '%s'\n", basedict); @@ -1144,7 +1206,7 @@ int main(int argc, char *argv[]) printk("Dumping dependencies to '%s'\n", depfilename); } - if (argc < optind + 1) { + if (argc < optind) { printk(USAGE, argv[0]); return 1; } @@ -1243,7 +1305,11 @@ int main(int argc, char *argv[]) #endif { relocation_table( bootstrapdict[0], bootstrapdict[1], dicthead); - write_dictionary( dictname ? dictname : "bootstrap.dict"); + if (hexdump) { + write_dictionary_hex(dictname); + } else { + write_dictionary(dictname); + } } free(ressources); -- 1.6.2.4

1 0

[PATCH 4/4] ppc: avoid runtime relocations
by Blue Swirl 21 Jan '11

21 Jan '11

Because the sizes of cells and pointers do not match on PPC64, relocations can't be computed in an ucell array by the linker. Introduce a method to relocate the dictionary to a fixed address by forthstrap. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> --- arch/ppc/build.xml | 6 +----- arch/ppc/qemu/kernel.c | 18 +++++++++++++----- arch/ppc/qemu/ldscript | 7 +++++++ arch/ppc/qemu/ofmem.c | 2 +- arch/ppc64/qemu/ldscript | 7 +++++++ kernel/bootstrap.c | 44 ++++++++++++++++++++++++++++++++++++-------- 6 files changed, 65 insertions(+), 19 deletions(-) diff --git a/arch/ppc/build.xml b/arch/ppc/build.xml index 4aec62f..2b7b605 100644 --- a/arch/ppc/build.xml +++ b/arch/ppc/build.xml @@ -60,11 +60,7 @@ <executable name="target/include/qemu-dict.h" target="target" condition="QEMU"> <rule><![CDATA[ - $(call quiet-command,true, " GEN $(TARGET_DIR)$@") - @echo "static const char forth_dictionary[] = {" > $@ - @cat $< | hexdump -ve '1/0 "\t" 8/1 "0x%02x, " 1/0 "\n"' \ - | sed 's/0x ,//g' >> $@ - @echo "};" >> $@]]></rule> + $(call quiet-command,$(ODIR)/forthstrap -x -a 0xfff08000 -D $@ -d $< </dev/null, " GEN $(TARGET_DIR)$@")]]></rule> <external-object source="openbios-qemu.dict"/> </executable> diff --git a/arch/ppc/qemu/kernel.c b/arch/ppc/qemu/kernel.c index 4cae525..fbb5925 100644 --- a/arch/ppc/qemu/kernel.c +++ b/arch/ppc/qemu/kernel.c @@ -17,7 +17,6 @@ * */ -#include "qemu-dict.h" #include "config.h" #include "dict.h" #include "libopenbios/bindings.h" @@ -27,7 +26,14 @@ #include "kernel.h" #define MEMORY_SIZE (256*1024) /* 256K ram for hosted system */ -#define DICTIONARY_SIZE (512*1024) /* 512K for the dictionary */ +/* 512K for the dictionary */ +#define DICTIONARY_SIZE (512 * 1024 / sizeof(ucell)) + +/* + * wrap an array around the hex'ed dictionary file + */ + +#include "qemu-dict.h" static ucell *memory; @@ -82,10 +88,12 @@ init_memory( void ) int initialize_forth( void ) { - dict = malloc(DICTIONARY_SIZE); - dictlimit = DICTIONARY_SIZE; + dict = (unsigned char *)forth_dictionary; + dicthead = (ucell)FORTH_DICTIONARY_END; + last = (ucell *)((unsigned char *)forth_dictionary + + FORTH_DICTIONARY_LAST); + dictlimit = sizeof(forth_dictionary); - load_dictionary( forth_dictionary, sizeof(forth_dictionary) ); forth_init(); PUSH_xt( bind_noname_func(arch_of_init) ); diff --git a/arch/ppc/qemu/ldscript b/arch/ppc/qemu/ldscript index 840b498..3b1855a 100644 --- a/arch/ppc/qemu/ldscript +++ b/arch/ppc/qemu/ldscript @@ -6,6 +6,7 @@ OUTPUT_ARCH(powerpc) BASE_ADDR = 0xfff00000; /* As NVRAM is at 0xfff04000, the .text needs to be after that + * The value in arch/ppc/build.xml must match this value! */ TEXT_ADDR = 0xfff08000; @@ -26,6 +27,12 @@ SECTIONS . = TEXT_ADDR; /* Normal sections */ + .data.dict ALIGN(4096): { + _dict_start = .; + *(.data.dict) + _dict_end = .; + } + .text ALIGN(4096): { *(.text) *(.text.*) diff --git a/arch/ppc/qemu/ofmem.c b/arch/ppc/qemu/ofmem.c index 4c6825e..f6cf8cd 100644 --- a/arch/ppc/qemu/ofmem.c +++ b/arch/ppc/qemu/ofmem.c @@ -55,7 +55,7 @@ extern void setup_mmu(unsigned long code_base); #define HASH_BITS 15 #endif #define HASH_SIZE (2 << HASH_BITS) -#define OFMEM_SIZE (2 * 1024 * 1024) +#define OFMEM_SIZE (1 * 1024 * 1024 + 512 * 1024) #define SEGR_USER BIT(2) #define SEGR_BASE 0x0400 diff --git a/arch/ppc64/qemu/ldscript b/arch/ppc64/qemu/ldscript index 7a22903..0bb2157 100644 --- a/arch/ppc64/qemu/ldscript +++ b/arch/ppc64/qemu/ldscript @@ -6,6 +6,7 @@ OUTPUT_ARCH(powerpc:common64) BASE_ADDR = 0xfff00000; /* As NVRAM is at 0xfff04000, the .text needs to be after that + * The value in arch/ppc/build.xml must match this value! */ TEXT_ADDR = 0xfff08000; @@ -26,6 +27,12 @@ SECTIONS . = TEXT_ADDR; /* Normal sections */ + .data.dict ALIGN(4096): { + _dict_start = .; + *(.data.dict) + _dict_end = .; + } + .text ALIGN(4096): { *(.text) *(.text.*) diff --git a/kernel/bootstrap.c b/kernel/bootstrap.c index 68fe5dd..b19c5c4 100644 --- a/kernel/bootstrap.c +++ b/kernel/bootstrap.c @@ -96,7 +96,15 @@ static const char *wordnames[] = { * dictionary related functions. */ -static void relocation_table(unsigned char * dict_one, unsigned char *dict_two, int length) +/* + * Compare two dictionaries constructed at different addresses. When + * the cells don't match, a need for relocation is detected and the + * corresponding bit in reloc_table bitmap is set. + * + * If offset is nonzero, add the offset to the cell instead. + */ +static void relocation_table(unsigned char * dict_one, unsigned char *dict_two, + int length, ucell offset) { ucell *d1=(ucell *)dict_one, *d2=(ucell *)dict_two; ucell *reloc_table; @@ -122,8 +130,12 @@ static void relocation_table(unsigned char * dict_one, unsigned char *dict_two, // printk("\nWARNING: inconsistent relocation (%x:%x)!\n", d1[i], d2[i]); } else { /* This is a pointer, it needs relocation, d2==dict */ - reloc_table[pos] |= target_ucell((ucell)1ULL << bit); - d2[i] = target_ucell(target_ucell(d2[i]) - pointer2cell(d2)); + if (!offset) { + reloc_table[pos] |= target_ucell((ucell)1ULL + << bit); + } + d2[i] = target_ucell(target_ucell(d2[i]) - + pointer2cell(d2) + offset); } } @@ -237,6 +249,11 @@ static void write_dictionary(const char *filename) #endif } +/* + * Write dictionary as a C array of ucells to filename. + * Put the array to special section so that its address can be fixed. + * Define some helpful constants. + */ static void write_dictionary_hex(const char *filename) { FILE *f; @@ -248,7 +265,8 @@ static void write_dictionary_hex(const char *filename) exit(1); } - fprintf(f, "static ucell forth_dictionary[DICTIONARY_SIZE] = {\n"); + fprintf(f, "static ucell forth_dictionary[DICTIONARY_SIZE] " + "__attribute__((section(\".data.dict\"))) = {\n"); for (walk = (ucell *)dict; walk < (ucell *)(dict + dicthead); walk++) { int pos, bit, l; ucell val; @@ -1075,7 +1093,10 @@ static void new_dictionary(const char *source) " -s|--segfault install segfault handler\n" \ " -M|--dependency-dump file\n" \ " dump dependencies in Makefile format\n\n" \ - " -x|--hexdump output format is C language hex dump\n" + " -x|--hexdump output format is C language hex dump\n" \ + " -a|--fixed-address base\n" \ + " relocate output to base\n" + #else #define USAGE "Usage: %s [options] [dictionary file|source file]\n\n" \ " -h show this help\n" \ @@ -1090,7 +1111,8 @@ static void new_dictionary(const char *source) " write kernel console output to log file\n" \ " -s install segfault handler\n\n" \ " -M file dump dependencies in Makefile format\n\n" \ - " -x output format is C language hex dump\n" + " -x output format is C language hex dump\n" \ + " -a base relocate output to base\n" #endif int main(int argc, char *argv[]) @@ -1105,8 +1127,9 @@ int main(int argc, char *argv[]) unsigned char *bootstrapdict[2]; int c, cnt, hexdump = 0; + ucell relocation_offset = 0; - const char *optstring = "VvhsI:d:D:c:M:x?"; + const char *optstring = "a:VvhsI:d:D:c:M:x?"; while (1) { #ifdef __GLIBC__ @@ -1122,6 +1145,7 @@ int main(int argc, char *argv[]) {"console", 1, NULL, 'c'}, {"dependency-dump", 1, NULL, 'M'}, {"hexdump", 0, NULL, 'x'}, + {"fixed-address", 1, NULL, 'a'}, }; /* @@ -1180,6 +1204,9 @@ int main(int argc, char *argv[]) case 'x': hexdump = 1; break; + case 'a': + relocation_offset = strtoll(optarg, NULL, 0); + break; default: return 1; } @@ -1293,7 +1320,8 @@ int main(int argc, char *argv[]) else #endif { - relocation_table( bootstrapdict[0], bootstrapdict[1], dicthead); + relocation_table(bootstrapdict[0], bootstrapdict[1], dicthead, + relocation_offset); if (hexdump) { write_dictionary_hex(dictname); } else { -- 1.6.2.4

1 0

[PATCH 3/4] x86: avoid runtime relocations
by Blue Swirl 21 Jan '11

21 Jan '11

Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> --- arch/x86/build.xml | 6 +----- arch/x86/builtin.c | 9 +++++++-- arch/x86/openbios.c | 12 ++++-------- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/arch/x86/build.xml b/arch/x86/build.xml index 8317209..02cecce 100644 --- a/arch/x86/build.xml +++ b/arch/x86/build.xml @@ -55,11 +55,7 @@ <executable name="target/include/static-dict.h" target="target" condition="IMAGE_ELF_EMBEDDED"> <rule><![CDATA[ - $(call quiet-command,true, " GEN $(TARGET_DIR)$@") - @echo "static const char forth_dictionary[] = {" > $@ - @cat $< | hexdump -ve '1/0 "\t" 8/1 "0x%02x, " 1/0 "\n"' \ - | sed 's/0x ,//g' >> $@ - @echo "};" >> $@]]></rule> + $(call quiet-command,$(ODIR)/forthstrap -x -D $@ -d $< </dev/null, " GEN $(TARGET_DIR)$@")]]></rule> <external-object source="openbios-x86.dict"/> </executable> diff --git a/arch/x86/builtin.c b/arch/x86/builtin.c index a649172..b02f939 100644 --- a/arch/x86/builtin.c +++ b/arch/x86/builtin.c @@ -13,12 +13,17 @@ * wrap an array around the hex'ed dictionary file */ +/* 256K for the dictionary */ +#define DICTIONARY_SIZE (256 * 1024 / sizeof(ucell)) + #include "static-dict.h" void collect_multiboot_info(struct sys_info *info); void collect_multiboot_info(struct sys_info *info) { info->dict_start=(unsigned long *)forth_dictionary; - info->dict_end=(unsigned long *)((ucell)forth_dictionary + - sizeof(forth_dictionary)); + info->dict_end = (unsigned long *)FORTH_DICTIONARY_END; + info->dict_last = (ucell *)((unsigned char *)forth_dictionary + + FORTH_DICTIONARY_LAST); + info->dict_limit = sizeof(forth_dictionary); } diff --git a/arch/x86/openbios.c b/arch/x86/openbios.c index 24b886d..dd444fa 100644 --- a/arch/x86/openbios.c +++ b/arch/x86/openbios.c @@ -22,9 +22,6 @@ void collect_sys_info(struct sys_info *info); -#define DICTIONARY_SIZE (256*1024) /* 256K for the dictionary */ -static unsigned char intdict[DICTIONARY_SIZE]; - #ifdef CONFIG_DRIVER_PCI static const pci_arch_t default_pci_host = { .name = "Intel,i440FX", @@ -84,12 +81,11 @@ int openbios(void) collect_sys_info(&sys_info); - dict=intdict; - dictlimit = DICTIONARY_SIZE; + dict = (unsigned char *)sys_info.dict_start; + dicthead = (cell)sys_info.dict_end; + last = sys_info.dict_last; + dictlimit = sys_info.dict_limit; - load_dictionary((char *)sys_info.dict_start, - (unsigned long)sys_info.dict_end - - (unsigned long)sys_info.dict_start); forth_init(); relocate(&sys_info); -- 1.6.2.4

1 0

[PATCH 2/4] sparc64: avoid runtime relocations
by Blue Swirl 21 Jan '11

21 Jan '11

Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> --- arch/sparc64/build.xml | 6 +----- arch/sparc64/builtin.c | 8 ++++++-- arch/sparc64/ofmem_sparc64.c | 2 +- arch/sparc64/openbios.c | 10 ++++------ 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/arch/sparc64/build.xml b/arch/sparc64/build.xml index 3bea63c..54807c5 100644 --- a/arch/sparc64/build.xml +++ b/arch/sparc64/build.xml @@ -40,11 +40,7 @@ <executable name="target/include/static-dict.h" target="target" condition="IMAGE_ELF_EMBEDDED"> <rule><![CDATA[ - $(call quiet-command,true, " GEN $(TARGET_DIR)$@") - @echo "static const char forth_dictionary[] = {" > $@ - @cat $< | hexdump -ve '1/0 "\t" 8/1 "0x%02x, " 1/0 "\n"' \ - | sed 's/0x ,//g' >> $@ - @echo "};" >> $@]]></rule> + $(call quiet-command,$(ODIR)/forthstrap -x -D $@ -d $< </dev/null, " GEN $(TARGET_DIR)$@")]]></rule> <external-object source="openbios-sparc64.dict"/> </executable> diff --git a/arch/sparc64/builtin.c b/arch/sparc64/builtin.c index aba8a2b..cf15bb5 100644 --- a/arch/sparc64/builtin.c +++ b/arch/sparc64/builtin.c @@ -14,12 +14,16 @@ * wrap an array around the hex'ed dictionary file */ +/* 512K for the dictionary */ +#define DICTIONARY_SIZE (512 * 1024 / sizeof(ucell)) #include "static-dict.h" void collect_multiboot_info(struct sys_info *info); void collect_multiboot_info(struct sys_info *info) { info->dict_start=(unsigned long *)forth_dictionary; - info->dict_end=(unsigned long *)((ucell)forth_dictionary + - sizeof(forth_dictionary)); + info->dict_end = (unsigned long *)FORTH_DICTIONARY_END; + info->dict_last = (ucell *)((unsigned char *)forth_dictionary + + FORTH_DICTIONARY_LAST); + info->dict_limit = sizeof(forth_dictionary); } diff --git a/arch/sparc64/ofmem_sparc64.c b/arch/sparc64/ofmem_sparc64.c index 1655978..1ed4a7a 100644 --- a/arch/sparc64/ofmem_sparc64.c +++ b/arch/sparc64/ofmem_sparc64.c @@ -20,7 +20,7 @@ #define OF_MALLOC_BASE ((char*)OFMEM + ALIGN_SIZE(sizeof(ofmem_t), 8)) -#define MEMSIZE ((256 + 512 + 512) * 1024) +#define MEMSIZE ((256 + 512) * 1024) static union { char memory[MEMSIZE]; ofmem_t ofmem; diff --git a/arch/sparc64/openbios.c b/arch/sparc64/openbios.c index 8c08814..ac709fe 100644 --- a/arch/sparc64/openbios.c +++ b/arch/sparc64/openbios.c @@ -33,7 +33,6 @@ #define APB_MEM_BASE 0x1ff00000000ULL #define MEMORY_SIZE (512*1024) /* 512K ram for hosted system */ -#define DICTIONARY_SIZE (512*1024) /* 512K for the dictionary */ static ucell *memory; @@ -617,12 +616,11 @@ int openbios(void) collect_sys_info(&sys_info); - dict = malloc(DICTIONARY_SIZE); - dictlimit = DICTIONARY_SIZE; + dict = (unsigned char *)sys_info.dict_start; + dicthead = (cell)sys_info.dict_end; + last = sys_info.dict_last; + dictlimit = sys_info.dict_limit; - load_dictionary((char *)sys_info.dict_start, - (unsigned long)sys_info.dict_end - - (unsigned long)sys_info.dict_start); forth_init(); #ifdef CONFIG_DEBUG_BOOT -- 1.6.2.4

1 0

[PATCH 1/4] sparc32: avoid runtime relocations
by Blue Swirl 21 Jan '11

21 Jan '11

The Forth dictionary was relocated at run time, incurring also a copy operation. The source dictionary remained in memory. It was not possible to run forthstrap without any input files besides the base dictionary. Make forthstrap generate a hex dump which can be included in C, but also contains relocations, so that relocations are performed by the linker at compile time. Allow dictionary compilation with no source files. Don't allocate the dictionary dynamically; reduce ofmem supply accordingly. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> --- arch/sparc32/build.xml | 6 +--- arch/sparc32/builtin.c | 9 ++++- arch/sparc32/ofmem_sparc32.c | 2 +- arch/sparc32/openbios.c | 10 ++--- include/libopenbios/sys_info.h | 2 + kernel/bootstrap.c | 71 +++++++++++++++++++++++++++++++++++---- 6 files changed, 78 insertions(+), 22 deletions(-) diff --git a/arch/sparc32/build.xml b/arch/sparc32/build.xml index 3d2f71d..47ad01a 100644 --- a/arch/sparc32/build.xml +++ b/arch/sparc32/build.xml @@ -42,11 +42,7 @@ <executable name="target/include/static-dict.h" target="target" condition="IMAGE_ELF_EMBEDDED"> <rule><![CDATA[ - $(call quiet-command,true, " GEN $(TARGET_DIR)$@") - @echo "static const char forth_dictionary[] = {" > $@ - @cat $< | hexdump -ve '1/0 "\t" 8/1 "0x%02x, " 1/0 "\n"' \ - | sed 's/0x ,//g' >> $@ - @echo "};" >> $@]]></rule> + $(call quiet-command,$(ODIR)/forthstrap -x -D $@ -d $< </dev/null, " GEN $(TARGET_DIR)$@")]]></rule> <external-object source="openbios-sparc32.dict"/> </executable> diff --git a/arch/sparc32/builtin.c b/arch/sparc32/builtin.c index 8bcce4c..839ffd6 100644 --- a/arch/sparc32/builtin.c +++ b/arch/sparc32/builtin.c @@ -14,12 +14,17 @@ * wrap an array around the hex'ed dictionary file */ +/* 256K for the dictionary */ +#define DICTIONARY_SIZE (256 * 1024 / sizeof(ucell)) + #include "static-dict.h" void collect_multiboot_info(struct sys_info *info); void collect_multiboot_info(struct sys_info *info) { info->dict_start=(unsigned long *)forth_dictionary; - info->dict_end=(unsigned long *)((ucell)forth_dictionary + - sizeof(forth_dictionary)); + info->dict_end = (unsigned long *)FORTH_DICTIONARY_END; + info->dict_last = (ucell *)((unsigned char *)forth_dictionary + + FORTH_DICTIONARY_LAST); + info->dict_limit = sizeof(forth_dictionary); } diff --git a/arch/sparc32/ofmem_sparc32.c b/arch/sparc32/ofmem_sparc32.c index 6815349..72079b2 100644 --- a/arch/sparc32/ofmem_sparc32.c +++ b/arch/sparc32/ofmem_sparc32.c @@ -21,7 +21,7 @@ #define OF_MALLOC_BASE ((char*)OFMEM + ALIGN_SIZE(sizeof(ofmem_t), 8)) -#define MEMSIZE (512 * 1024) +#define MEMSIZE (256 * 1024) static union { char memory[MEMSIZE]; ofmem_t ofmem; diff --git a/arch/sparc32/openbios.c b/arch/sparc32/openbios.c index c940a5f..1d8842a 100644 --- a/arch/sparc32/openbios.c +++ b/arch/sparc32/openbios.c @@ -28,7 +28,6 @@ #include "libopenbios/ofmem.h" #define MEMORY_SIZE (16*1024) /* 16K ram for hosted system */ -#define DICTIONARY_SIZE (256*1024) /* 256K for the dictionary */ #define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" #define FW_CFG_SUN4M_DEPTH (FW_CFG_ARCH_LOCAL + 0x00) @@ -968,12 +967,11 @@ int openbios(void) collect_sys_info(&sys_info); - dict = malloc(DICTIONARY_SIZE); - dictlimit = DICTIONARY_SIZE; + dict = (unsigned char *)sys_info.dict_start; + dicthead = (cell)sys_info.dict_end; + last = sys_info.dict_last; + dictlimit = sys_info.dict_limit; - load_dictionary((char *)sys_info.dict_start, - (unsigned long)sys_info.dict_end - - (unsigned long)sys_info.dict_start); forth_init(); #ifdef CONFIG_DEBUG_BOOT diff --git a/include/libopenbios/sys_info.h b/include/libopenbios/sys_info.h index 2eea9af..a8b3cce 100644 --- a/include/libopenbios/sys_info.h +++ b/include/libopenbios/sys_info.h @@ -20,6 +20,8 @@ struct sys_info { } *memrange; unsigned long *dict_start; unsigned long *dict_end; + cell dict_limit; + ucell *dict_last; }; extern void *elf_boot_notes; diff --git a/kernel/bootstrap.c b/kernel/bootstrap.c index 94aaeb8..68fe5dd 100644 --- a/kernel/bootstrap.c +++ b/kernel/bootstrap.c @@ -237,6 +237,48 @@ static void write_dictionary(const char *filename) #endif } +static void write_dictionary_hex(const char *filename) +{ + FILE *f; + ucell *walk; + + f = fopen(filename, "w"); + if (!f) { + printk("panic: can't write to dictionary '%s'.\n", filename); + exit(1); + } + + fprintf(f, "static ucell forth_dictionary[DICTIONARY_SIZE] = {\n"); + for (walk = (ucell *)dict; walk < (ucell *)(dict + dicthead); walk++) { + int pos, bit, l; + ucell val; + + l = (walk - (ucell *)dict); + pos = l / BITS; + bit = l & ~(-BITS); + + val = read_ucell(walk); + if (relocation_address[pos] & target_ucell((ucell)1ULL << bit)) { + fprintf(f, "(ucell)((char *)&forth_dictionary + 0x%" FMT_CELL_x + "),\n", val); + } else { + fprintf(f, "0x%" FMT_CELL_x",\n", val); + } + } + + fprintf(f, "};\n"); + + fprintf(f, "#define FORTH_DICTIONARY_LAST 0x%" FMT_CELL_x"\n", + (ucell)((unsigned long)last - (unsigned long)dict)); + fprintf(f, "#define FORTH_DICTIONARY_END 0x%" FMT_CELL_x"\n", + (ucell)dicthead); + fclose(f); + +#ifdef CONFIG_DEBUG_DICTIONARY + printk("wrote dictionary to file %s.\n", filename); +#endif +} + static ucell read_dictionary(char *fil) { int ilen; @@ -1032,7 +1074,8 @@ static void new_dictionary(const char *source) " write kernel console output to log file\n" \ " -s|--segfault install segfault handler\n" \ " -M|--dependency-dump file\n" \ - " dump dependencies in Makefile format\n\n" + " dump dependencies in Makefile format\n\n" \ + " -x|--hexdump output format is C language hex dump\n" #else #define USAGE "Usage: %s [options] [dictionary file|source file]\n\n" \ " -h show this help\n" \ @@ -1045,8 +1088,9 @@ static void new_dictionary(const char *source) " write to output.dict\n" \ " -c output.log\n" \ " write kernel console output to log file\n" \ - " -s install segfault handler\n\n" - " -M file dump dependencies in Makefile format\n\n" + " -s install segfault handler\n\n" \ + " -M file dump dependencies in Makefile format\n\n" \ + " -x output format is C language hex dump\n" #endif int main(int argc, char *argv[]) @@ -1054,15 +1098,15 @@ int main(int argc, char *argv[]) struct sigaction sa; unsigned char *ressources=NULL; /* All memory used by us */ - char *dictname = NULL; + const char *dictname = NULL; char *basedict = NULL; char *consolefile = NULL; char *depfilename = NULL; unsigned char *bootstrapdict[2]; - int c, cnt; + int c, cnt, hexdump = 0; - const char *optstring = "VvhsI:d:D:c:M:?"; + const char *optstring = "VvhsI:d:D:c:M:x?"; while (1) { #ifdef __GLIBC__ @@ -1077,6 +1121,7 @@ int main(int argc, char *argv[]) {"target-dictionary", 1, NULL, 'D'}, {"console", 1, NULL, 'c'}, {"dependency-dump", 1, NULL, 'M'}, + {"hexdump", 0, NULL, 'x'}, }; /* @@ -1132,11 +1177,17 @@ int main(int argc, char *argv[]) depfilename = optarg; } break; + case 'x': + hexdump = 1; + break; default: return 1; } } + if (!dictname) { + dictname = "bootstrap.dict"; + } if (verbose) { printk(BANNER); printk("Using source dictionary '%s'\n", basedict); @@ -1144,7 +1195,7 @@ int main(int argc, char *argv[]) printk("Dumping dependencies to '%s'\n", depfilename); } - if (argc < optind + 1) { + if (argc < optind) { printk(USAGE, argv[0]); return 1; } @@ -1243,7 +1294,11 @@ int main(int argc, char *argv[]) #endif { relocation_table( bootstrapdict[0], bootstrapdict[1], dicthead); - write_dictionary( dictname ? dictname : "bootstrap.dict"); + if (hexdump) { + write_dictionary_hex(dictname); + } else { + write_dictionary(dictname); + } } free(ressources); -- 1.6.2.4

1 0

AIX
by Grieve, Shane 11 Jan '11

11 Jan '11

Any progress on getting AIX to boot I am not a developer but happy to help test and have access to AIX machines.

1 0

Re: [OpenBIOS] [PATCH 0/6] OFMEM/SPARC32 memory fixes
by Artyom Tarasenko 10 Jan '11

10 Jan '11

On Sun, Jan 9, 2011 at 6:56 PM, Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> wrote: > This patchset fixes up a couple of minor bugs in OFMEM and also fixes up > the SPARC32 memory/virtual-memory properties so that they are similar as > to how they appear under OBP. This furthers Solaris 8 boot in my tests > here. Sounds great! How far do you get it now? -- Regards, Artyom Tarasenko solaris/sparc under qemu blog: http://tyom.blogspot.com/

2 1

Re: [OpenBIOS] [PATCH 0/6] OFMEM/SPARC32 memory fixes
by Blue Swirl 09 Jan '11

09 Jan '11

On Sun, Jan 9, 2011 at 5:56 PM, Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> wrote: > This patchset fixes up a couple of minor bugs in OFMEM and also fixes up > the SPARC32 memory/virtual-memory properties so that they are similar as > to how they appear under OBP. This furthers Solaris 8 boot in my tests > here. Passes also my tests, so: Tested-by: Blue Swirl <blauwirbel(a)gmail.com> Reviewed-by: Blue Swirl <blauwirbel(a)gmail.com>

1 0

[PATCH 6/6] OFMEM: Fix bogus tail entry added to the end of the virtual memory available list.
by Mark Cave-Ayland 09 Jan '11

09 Jan '11

Since top_address is 64-bit, the existing code would incorrectly think that the end of virtual memory had not been reached and so add a bogus tail entry. Casting -1 to ucell should ensure that we pass the correct top address for virtual memory. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> --- openbios-devel/libopenbios/ofmem_common.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/openbios-devel/libopenbios/ofmem_common.c b/openbios-devel/libopenbios/ofmem_common.c index a2c69f8..ac36fca 100644 --- a/openbios-devel/libopenbios/ofmem_common.c +++ b/openbios-devel/libopenbios/ofmem_common.c @@ -347,7 +347,7 @@ static void ofmem_update_translations( void ) ofmem_update_memory_available(s_phandle_memory, ofmem->phys_range, &phys_range_prop, &phys_range_prop_size, &phys_range_prop_used, ofmem_arch_get_phys_top()); ofmem_update_memory_available(s_phandle_mmu, ofmem->virt_range, - &virt_range_prop, &virt_range_prop_size, &virt_range_prop_used, -1ULL); + &virt_range_prop, &virt_range_prop_size, &virt_range_prop_used, (ucell)-1); ofmem_update_mmu_translations(); } -- 1.7.2.3

1 0

[PATCH 5/6] OFMEM: Fix missing ofmem_update_translations() calls.
by Mark Cave-Ayland 09 Jan '11

09 Jan '11

Otherwise the device tree properties will not always get updated to reflect the current memory ranges. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> --- openbios-devel/libopenbios/ofmem_common.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/openbios-devel/libopenbios/ofmem_common.c b/openbios-devel/libopenbios/ofmem_common.c index 6d0f417..a2c69f8 100644 --- a/openbios-devel/libopenbios/ofmem_common.c +++ b/openbios-devel/libopenbios/ofmem_common.c @@ -481,6 +481,7 @@ static phys_addr_t ofmem_claim_phys_( phys_addr_t phys, ucell size, ucell align, return -1; } add_entry( phys, size, &ofmem->phys_range ); + ofmem_update_translations(); return phys; } phys = find_area( align, size, ofmem->phys_range, min, max, reverse ); @@ -515,6 +516,7 @@ static ucell ofmem_claim_virt_( ucell virt, ucell size, ucell align, return -1; } add_entry( virt, size, &ofmem->virt_range ); + ofmem_update_translations(); return virt; } @@ -524,6 +526,9 @@ static ucell ofmem_claim_virt_( ucell virt, ucell size, ucell align, return -1; } add_entry( virt, size, &ofmem->virt_range ); + + ofmem_update_translations(); + return virt; } -- 1.7.2.3

1 0

[PATCH 4/6] Fix up /virtual-memory reg property on SPARC32.
by Mark Cave-Ayland 09 Jan '11

09 Jan '11

Make it similar to the OBP output with 2 entries consisting of half the virtual address space. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> --- openbios-devel/arch/sparc32/lib.c | 30 +++++++++++++++++++++++++----- openbios-devel/drivers/iommu.c | 14 -------------- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/openbios-devel/arch/sparc32/lib.c b/openbios-devel/arch/sparc32/lib.c index 90a070b..5b41dff 100644 --- a/openbios-devel/arch/sparc32/lib.c +++ b/openbios-devel/arch/sparc32/lib.c @@ -373,7 +373,10 @@ void obp_dumb_memfree(__attribute__((unused))char *va, void ob_init_mmu(void) { - ucell *reg; + ucell *memreg; + ucell *virtreg; + phys_addr_t virtregsize; + ofmem_t *ofmem = ofmem_arch_get_private(); init_romvec_mem(); @@ -391,18 +394,35 @@ ob_init_mmu(void) ofmem_register(s_phandle_memory, s_phandle_mmu); /* Setup /memory:reg (totphys) property */ - reg = malloc(3 * sizeof(ucell)); - ofmem_arch_encode_physaddr(reg, 0); /* physical base */ - reg[2] = (ucell)ofmem_arch_get_phys_top(); /* size */ + memreg = malloc(3 * sizeof(ucell)); + ofmem_arch_encode_physaddr(memreg, 0); /* physical base */ + memreg[2] = (ucell)ofmem->ramsize; /* size */ push_str("/memory"); fword("find-device"); - PUSH(pointer2cell(reg)); + PUSH(pointer2cell(memreg)); PUSH(3 * sizeof(ucell)); push_str("reg"); PUSH_ph(s_phandle_memory); fword("encode-property"); + /* Setup /virtual-memory:reg property */ + virtregsize = ((phys_addr_t)((ucell)-1) + 1) / 2; + + virtreg = malloc(6 * sizeof(ucell)); + ofmem_arch_encode_physaddr(virtreg, 0); + virtreg[2] = virtregsize; + ofmem_arch_encode_physaddr(&virtreg[3], virtregsize); + virtreg[5] = virtregsize; + + push_str("/virtual-memory"); + fword("find-device"); + PUSH(pointer2cell(virtreg)); + PUSH(6 * sizeof(ucell)); + push_str("reg"); + PUSH_ph(s_phandle_mmu); + fword("encode-property"); + PUSH(0); fword("active-package!"); bind_func("pgmap@", pgmap_fetch); diff --git a/openbios-devel/drivers/iommu.c b/openbios-devel/drivers/iommu.c index 28f3b57..5eb8a60 100644 --- a/openbios-devel/drivers/iommu.c +++ b/openbios-devel/drivers/iommu.c @@ -155,20 +155,6 @@ ob_init_iommu(uint64_t base) regs = iommu_init(&ciommu, base); - push_str("/virtual-memory"); - fword("find-device"); - - PUSH(base >> 32); - fword("encode-int"); - PUSH(base & 0xffffffff); - fword("encode-int"); - fword("encode+"); - PUSH(IOMMU_REGS); - fword("encode-int"); - fword("encode+"); - push_str("reg"); - fword("property"); - push_str("/iommu"); fword("find-device"); PUSH((unsigned long)regs); -- 1.7.2.3

1 0

[PATCH 3/6] Explicitly claim physical and virtual memory used by OpenBIOS in OFMEM under SPARC32.
by Mark Cave-Ayland 09 Jan '11

09 Jan '11

This is required to ensure that Solaris doesn't consider the memory used by OpenBIOS as available when interpreting the memory lists. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> --- openbios-devel/arch/sparc32/ofmem_sparc32.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/openbios-devel/arch/sparc32/ofmem_sparc32.c b/openbios-devel/arch/sparc32/ofmem_sparc32.c index b71f405..1f1cecf 100644 --- a/openbios-devel/arch/sparc32/ofmem_sparc32.c +++ b/openbios-devel/arch/sparc32/ofmem_sparc32.c @@ -161,4 +161,10 @@ void ofmem_init( void ) { memset(&s_ofmem_data, 0, sizeof(s_ofmem_data)); s_ofmem_data.ofmem.ramsize = qemu_mem_size; + + /* Claim reserved physical addresses at top of RAM */ + ofmem_claim_phys(ofmem_arch_get_phys_top(), s_ofmem_data.ofmem.ramsize - ofmem_arch_get_phys_top(), 0); + + /* Claim OpenBIOS reserved space */ + ofmem_claim_virt(0xffd00000, 0x300000, 0); } -- 1.7.2.3

1 0

[PATCH 2/6] Switch SPARC32 to use 2 address cells for addresses within the /virtual-memory available property.
by Mark Cave-Ayland 09 Jan '11

09 Jan '11

This matches the format of the /virtual-memory available property generated by OBP under QEMU. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> --- openbios-devel/arch/sparc32/ofmem_sparc32.c | 13 ++----------- 1 files changed, 2 insertions(+), 11 deletions(-) diff --git a/openbios-devel/arch/sparc32/ofmem_sparc32.c b/openbios-devel/arch/sparc32/ofmem_sparc32.c index ba47913..b71f405 100644 --- a/openbios-devel/arch/sparc32/ofmem_sparc32.c +++ b/openbios-devel/arch/sparc32/ofmem_sparc32.c @@ -127,11 +127,7 @@ void ofmem_arch_create_translation_entry(ucell *transentry, translation_t *t) /* Return the size of a memory available entry given the phandle in cells */ int ofmem_arch_get_available_entry_size(phandle_t ph) { - if (ph == s_phandle_memory) { - return 1 + ofmem_arch_get_physaddr_cellsize(); - } else { - return 1 + 1; - } + return 1 + ofmem_arch_get_physaddr_cellsize(); } /* Generate memory available property entry for Sparc32 */ @@ -139,12 +135,7 @@ void ofmem_arch_create_available_entry(phandle_t ph, ucell *availentry, phys_add { int i = 0; - if (ph == s_phandle_memory) { - i += ofmem_arch_encode_physaddr(availentry, start); - } else { - availentry[i++] = start; - } - + i += ofmem_arch_encode_physaddr(availentry, start); availentry[i] = size; } -- 1.7.2.3

1 0

[PATCH 1/6] Delegate construction of memory "available" property to each architecture.
by Mark Cave-Ayland 09 Jan '11

09 Jan '11

This is required because some architectures do not strictly follow the convention of using physical addresses sizes in the /memory node and virtual addresses in the /virtual-memory node. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> --- openbios-devel/arch/ppc/qemu/ofmem.c | 24 ++++++++++++++++++++++++ openbios-devel/arch/sparc32/lib.c | 2 -- openbios-devel/arch/sparc32/ofmem_sparc32.c | 24 ++++++++++++++++++++++++ openbios-devel/arch/sparc64/ofmem_sparc64.c | 24 ++++++++++++++++++++++++ openbios-devel/include/libopenbios/ofmem.h | 6 ++++++ openbios-devel/libopenbios/ofmem_common.c | 27 +++++++-------------------- 6 files changed, 85 insertions(+), 22 deletions(-) diff --git a/openbios-devel/arch/ppc/qemu/ofmem.c b/openbios-devel/arch/ppc/qemu/ofmem.c index 4c6825e..f654d0f 100644 --- a/openbios-devel/arch/ppc/qemu/ofmem.c +++ b/openbios-devel/arch/ppc/qemu/ofmem.c @@ -195,6 +195,30 @@ void ofmem_arch_create_translation_entry(ucell *transentry, translation_t *t) transentry[i++] = t->mode; } +/* Return the size of a memory available entry given the phandle in cells */ +int ofmem_arch_get_available_entry_size(phandle_t ph) +{ + if (ph == s_phandle_memory) { + return 1 + ofmem_arch_get_physaddr_cellsize(); + } else { + return 1 + 1; + } +} + +/* Generate memory available property entry for PPC */ +void ofmem_arch_create_available_entry(phandle_t ph, ucell *availentry, phys_addr_t start, ucell size) +{ + int i = 0; + + if (ph == s_phandle_memory) { + i += ofmem_arch_encode_physaddr(availentry, start); + } else { + availentry[i++] = start; + } + + availentry[i] = size; +} + /************************************************************************/ /* OF private allocations */ /************************************************************************/ diff --git a/openbios-devel/arch/sparc32/lib.c b/openbios-devel/arch/sparc32/lib.c index 72d3a87..90a070b 100644 --- a/openbios-devel/arch/sparc32/lib.c +++ b/openbios-devel/arch/sparc32/lib.c @@ -59,8 +59,6 @@ unsigned int va_shift; static unsigned long *context_table; static unsigned long *l1; -static phandle_t s_phandle_memory = 0; -static phandle_t s_phandle_mmu = 0; static ucell *mem_reg = 0; static ucell *mem_avail = 0; static ucell *virt_avail = 0; diff --git a/openbios-devel/arch/sparc32/ofmem_sparc32.c b/openbios-devel/arch/sparc32/ofmem_sparc32.c index 6815349..ba47913 100644 --- a/openbios-devel/arch/sparc32/ofmem_sparc32.c +++ b/openbios-devel/arch/sparc32/ofmem_sparc32.c @@ -124,6 +124,30 @@ void ofmem_arch_create_translation_entry(ucell *transentry, translation_t *t) transentry[2] = t->mode; } +/* Return the size of a memory available entry given the phandle in cells */ +int ofmem_arch_get_available_entry_size(phandle_t ph) +{ + if (ph == s_phandle_memory) { + return 1 + ofmem_arch_get_physaddr_cellsize(); + } else { + return 1 + 1; + } +} + +/* Generate memory available property entry for Sparc32 */ +void ofmem_arch_create_available_entry(phandle_t ph, ucell *availentry, phys_addr_t start, ucell size) +{ + int i = 0; + + if (ph == s_phandle_memory) { + i += ofmem_arch_encode_physaddr(availentry, start); + } else { + availentry[i++] = start; + } + + availentry[i] = size; +} + /************************************************************************/ /* misc */ /************************************************************************/ diff --git a/openbios-devel/arch/sparc64/ofmem_sparc64.c b/openbios-devel/arch/sparc64/ofmem_sparc64.c index 1655978..d4caddc 100644 --- a/openbios-devel/arch/sparc64/ofmem_sparc64.c +++ b/openbios-devel/arch/sparc64/ofmem_sparc64.c @@ -110,6 +110,30 @@ void ofmem_arch_create_translation_entry(ucell *transentry, translation_t *t) transentry[2] = t->mode; } +/* Return the size of a memory available entry given the phandle in cells */ +int ofmem_arch_get_available_entry_size(phandle_t ph) +{ + if (ph == s_phandle_memory) { + return 1 + ofmem_arch_get_physaddr_cellsize(); + } else { + return 1 + 1; + } +} + +/* Generate memory available property entry for Sparc64 */ +void ofmem_arch_create_available_entry(phandle_t ph, ucell *availentry, phys_addr_t start, ucell size) +{ + int i = 0; + + if (ph == s_phandle_memory) { + i += ofmem_arch_encode_physaddr(availentry, start); + } else { + availentry[i++] = start; + } + + availentry[i] = size; +} + /************************************************************************/ /* misc */ /************************************************************************/ diff --git a/openbios-devel/include/libopenbios/ofmem.h b/openbios-devel/include/libopenbios/ofmem.h index 2269fd7..30f20d8 100644 --- a/openbios-devel/include/libopenbios/ofmem.h +++ b/openbios-devel/include/libopenbios/ofmem.h @@ -69,6 +69,8 @@ extern ucell ofmem_arch_get_iomem_top(void); extern retain_t* ofmem_arch_get_retained(void); extern int ofmem_arch_get_physaddr_cellsize(void); extern int ofmem_arch_encode_physaddr(ucell *p, phys_addr_t value); +extern int ofmem_arch_get_available_entry_size(phandle_t ph); +extern void ofmem_arch_create_available_entry(phandle_t ph, ucell *availentry, phys_addr_t start, ucell size); extern int ofmem_arch_get_translation_entry_size(void); extern void ofmem_arch_create_translation_entry(ucell *transentry, translation_t *t); extern ucell ofmem_arch_default_translation_mode( phys_addr_t phys ); @@ -120,6 +122,10 @@ extern void ofmem_release_phys( phys_addr_t phys, ucell size ); extern void ofmem_release_virt( ucell virt, ucell size ); extern phys_addr_t ofmem_translate( ucell virt, ucell *ret_mode ); +/* memory and virtual-memory nodes */ +extern phandle_t s_phandle_memory; +extern phandle_t s_phandle_mmu; + /* Currently the same for all architectures */ #define PAGE_SHIFT 12 diff --git a/openbios-devel/libopenbios/ofmem_common.c b/openbios-devel/libopenbios/ofmem_common.c index 7f6223b..6d0f417 100644 --- a/openbios-devel/libopenbios/ofmem_common.c +++ b/openbios-devel/libopenbios/ofmem_common.c @@ -222,8 +222,8 @@ ofmem_set_property( phandle_t ph, const char *name, const char *buf, int len ) fword("encode-property"); } -static phandle_t s_phandle_memory = 0; -static phandle_t s_phandle_mmu = 0; +phandle_t s_phandle_memory = 0; +phandle_t s_phandle_mmu = 0; static void ofmem_update_mmu_translations( void ) { @@ -290,8 +290,7 @@ static void ofmem_update_memory_available( phandle_t ph, range_t *range, /* inverse of phys_range list could take 2 or more additional cells for the tail For /memory, physical addresses may be wider than one ucell. */ - prop_used = (ncells + 1) * sizeof(ucell) * - (((ph == s_phandle_memory) ? ofmem_arch_get_physaddr_cellsize() : 1) + 1); + prop_used = (ncells + 1) * sizeof(ucell) * ofmem_arch_get_available_entry_size(ph) + 1; if (prop_used > *mem_prop_size) { @@ -325,28 +324,16 @@ static void ofmem_update_memory_available( phandle_t ph, range_t *range, size = r->start - start; if (size) { - if (ph == s_phandle_memory) { - /* physical address for /memory */ - ncells += ofmem_arch_encode_physaddr(&prop[ncells], start); - } else { - /* virtual address for MMU */ - prop[ncells++] = start; - } - prop[ncells++] = size; + ofmem_arch_create_available_entry(ph, &prop[ncells], start, size); + ncells += ofmem_arch_get_available_entry_size(ph); } start = r->start + r->size; } /* tail */ if (start < top_address) { - if (ph == s_phandle_memory) { - /* physical address for /memory */ - ncells += ofmem_arch_encode_physaddr(&prop[ncells], start); - } else { - /* virtual address for MMU */ - prop[ncells++] = start; - } - prop[ncells++] = top_address - start; + ofmem_arch_create_available_entry(ph, &prop[ncells], start, top_address - start); + ncells += ofmem_arch_get_available_entry_size(ph); } ofmem_set_property(ph, "available", -- 1.7.2.3

1 0

[PATCH 0/6] OFMEM/SPARC32 memory fixes
by Mark Cave-Ayland 09 Jan '11

09 Jan '11

This patchset fixes up a couple of minor bugs in OFMEM and also fixes up the SPARC32 memory/virtual-memory properties so that they are similar as to how they appear under OBP. This furthers Solaris 8 boot in my tests here. v2: Fix original patchset based upon comments from Blue, and extend to resolve some additional bugs. v1: Original submission. Mark Cave-Ayland (6): Delegate construction of memory "available" property to each architecture. Switch SPARC32 to use 2 address cells for addresses within the /virtual-memory available property. Explicitly claim physical and virtual memory used by OpenBIOS in OFMEM under SPARC32. Fix up /virtual-memory reg property on SPARC32. OFMEM: Fix missing ofmem_update_translations() calls. OFMEM: Fix bogus tail entry added to the end of the virtual memory available list. openbios-devel/arch/ppc/qemu/ofmem.c | 24 +++++++++++++++++++ openbios-devel/arch/sparc32/lib.c | 32 +++++++++++++++++++----- openbios-devel/arch/sparc32/ofmem_sparc32.c | 21 ++++++++++++++++ openbios-devel/arch/sparc64/ofmem_sparc64.c | 24 +++++++++++++++++++ openbios-devel/drivers/iommu.c | 14 ----------- openbios-devel/include/libopenbios/ofmem.h | 6 ++++ openbios-devel/libopenbios/ofmem_common.c | 34 ++++++++++---------------- 7 files changed, 113 insertions(+), 42 deletions(-) -- 1.7.2.3

1 0

[commit] r1014 - in trunk/openbios-devel: libopenbios packages
by repository service 08 Jan '11

08 Jan '11

Author: blueswirl Date: Sat Jan 8 20:44:38 2011 New Revision: 1014 URL: http://tracker.coreboot.org/trac/openbios/changeset/1014 Log: Fix some memory leaks Fix memory leaks reported by cppcheck: [../packages/pc-parts.c:291]: (error) Memory leak: parstr [../libopenbios/bootinfo_load.c:172]: (error) Memory leak: bootscript Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/libopenbios/bootinfo_load.c trunk/openbios-devel/packages/pc-parts.c Modified: trunk/openbios-devel/libopenbios/bootinfo_load.c ============================================================================== --- trunk/openbios-devel/libopenbios/bootinfo_load.c Sun Jan 2 10:56:19 2011 (r1013) +++ trunk/openbios-devel/libopenbios/bootinfo_load.c Sat Jan 8 20:44:38 2011 (r1014) @@ -169,6 +169,7 @@ if (!is_bootinfo(base)) { DPRINTF("Not a valid bootinfo memory image\n"); + free(bootscript); return; } Modified: trunk/openbios-devel/packages/pc-parts.c ============================================================================== --- trunk/openbios-devel/packages/pc-parts.c Sun Jan 2 10:56:19 2011 (r1013) +++ trunk/openbios-devel/packages/pc-parts.c Sat Jan 8 20:44:38 2011 (r1014) @@ -131,6 +131,7 @@ } DPRINTF("parstr: %s argstr: %s parnum: %d\n", parstr, argstr, parnum); + free(parstr); if( parnum < 0 ) parnum = 0;

1 0

[PATCH 1/2] Delegate construction of memory "available" property to each architecture.
by Mark Cave-Ayland 08 Jan '11

08 Jan '11

This is required because some architectures do not strictly follow the convention of using physical addresses sizes in the /memory node and virtual addresses in the /virtual-memory node. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> --- openbios-devel/arch/ppc/qemu/ofmem.c | 24 ++++++++++++++++++++++++ openbios-devel/arch/sparc32/lib.c | 2 -- openbios-devel/arch/sparc32/ofmem_sparc32.c | 24 ++++++++++++++++++++++++ openbios-devel/arch/sparc64/ofmem_sparc64.c | 24 ++++++++++++++++++++++++ openbios-devel/include/libopenbios/ofmem.h | 6 ++++++ openbios-devel/libopenbios/ofmem_common.c | 27 +++++++-------------------- 6 files changed, 85 insertions(+), 22 deletions(-) diff --git a/openbios-devel/arch/ppc/qemu/ofmem.c b/openbios-devel/arch/ppc/qemu/ofmem.c index 4c6825e..25bbc39 100644 --- a/openbios-devel/arch/ppc/qemu/ofmem.c +++ b/openbios-devel/arch/ppc/qemu/ofmem.c @@ -195,6 +195,30 @@ void ofmem_arch_create_translation_entry(ucell *transentry, translation_t *t) transentry[i++] = t->mode; } +/* Return the size of a memory available node given the phandle in cells */ +int ofmem_arch_get_available_entry_size(phandle_t ph) +{ + if (ph == s_phandle_memory) { + return 1 + ofmem_arch_get_physaddr_cellsize(); + } else { + return 1 + 1; + } +} + +/* Generate memory available property entry for PPC */ +void ofmem_arch_create_available_entry(phandle_t ph, ucell *availentry, phys_addr_t start, ucell size) +{ + int i = 0; + + if (ph == s_phandle_memory) { + i += ofmem_arch_encode_physaddr(availentry, start); + } else { + availentry[i++] = start; + } + + availentry[i++] = size; +} + /************************************************************************/ /* OF private allocations */ /************************************************************************/ diff --git a/openbios-devel/arch/sparc32/lib.c b/openbios-devel/arch/sparc32/lib.c index 72d3a87..90a070b 100644 --- a/openbios-devel/arch/sparc32/lib.c +++ b/openbios-devel/arch/sparc32/lib.c @@ -59,8 +59,6 @@ unsigned int va_shift; static unsigned long *context_table; static unsigned long *l1; -static phandle_t s_phandle_memory = 0; -static phandle_t s_phandle_mmu = 0; static ucell *mem_reg = 0; static ucell *mem_avail = 0; static ucell *virt_avail = 0; diff --git a/openbios-devel/arch/sparc32/ofmem_sparc32.c b/openbios-devel/arch/sparc32/ofmem_sparc32.c index 6815349..aee736a 100644 --- a/openbios-devel/arch/sparc32/ofmem_sparc32.c +++ b/openbios-devel/arch/sparc32/ofmem_sparc32.c @@ -124,6 +124,30 @@ void ofmem_arch_create_translation_entry(ucell *transentry, translation_t *t) transentry[2] = t->mode; } +/* Return the size of a memory available node given the phandle in cells */ +int ofmem_arch_get_available_entry_size(phandle_t ph) +{ + if (ph == s_phandle_memory) { + return 1 + ofmem_arch_get_physaddr_cellsize(); + } else { + return 1 + 1; + } +} + +/* Generate memory available property entry for Sparc32 */ +void ofmem_arch_create_available_entry(phandle_t ph, ucell *availentry, phys_addr_t start, ucell size) +{ + int i = 0; + + if (ph == s_phandle_memory) { + i += ofmem_arch_encode_physaddr(availentry, start); + } else { + availentry[i++] = start; + } + + availentry[i++] = size; +} + /************************************************************************/ /* misc */ /************************************************************************/ diff --git a/openbios-devel/arch/sparc64/ofmem_sparc64.c b/openbios-devel/arch/sparc64/ofmem_sparc64.c index 1655978..6904fee 100644 --- a/openbios-devel/arch/sparc64/ofmem_sparc64.c +++ b/openbios-devel/arch/sparc64/ofmem_sparc64.c @@ -110,6 +110,30 @@ void ofmem_arch_create_translation_entry(ucell *transentry, translation_t *t) transentry[2] = t->mode; } +/* Return the size of a memory available node given the phandle in cells */ +int ofmem_arch_get_available_entry_size(phandle_t ph) +{ + if (ph == s_phandle_memory) { + return 1 + ofmem_arch_get_physaddr_cellsize(); + } else { + return 1 + 1; + } +} + +/* Generate memory available property entry for Sparc64 */ +void ofmem_arch_create_available_entry(phandle_t ph, ucell *availentry, phys_addr_t start, ucell size) +{ + int i = 0; + + if (ph == s_phandle_memory) { + i += ofmem_arch_encode_physaddr(availentry, start); + } else { + availentry[i++] = start; + } + + availentry[i++] = size; +} + /************************************************************************/ /* misc */ /************************************************************************/ diff --git a/openbios-devel/include/libopenbios/ofmem.h b/openbios-devel/include/libopenbios/ofmem.h index 2269fd7..30f20d8 100644 --- a/openbios-devel/include/libopenbios/ofmem.h +++ b/openbios-devel/include/libopenbios/ofmem.h @@ -69,6 +69,8 @@ extern ucell ofmem_arch_get_iomem_top(void); extern retain_t* ofmem_arch_get_retained(void); extern int ofmem_arch_get_physaddr_cellsize(void); extern int ofmem_arch_encode_physaddr(ucell *p, phys_addr_t value); +extern int ofmem_arch_get_available_entry_size(phandle_t ph); +extern void ofmem_arch_create_available_entry(phandle_t ph, ucell *availentry, phys_addr_t start, ucell size); extern int ofmem_arch_get_translation_entry_size(void); extern void ofmem_arch_create_translation_entry(ucell *transentry, translation_t *t); extern ucell ofmem_arch_default_translation_mode( phys_addr_t phys ); @@ -120,6 +122,10 @@ extern void ofmem_release_phys( phys_addr_t phys, ucell size ); extern void ofmem_release_virt( ucell virt, ucell size ); extern phys_addr_t ofmem_translate( ucell virt, ucell *ret_mode ); +/* memory and virtual-memory nodes */ +extern phandle_t s_phandle_memory; +extern phandle_t s_phandle_mmu; + /* Currently the same for all architectures */ #define PAGE_SHIFT 12 diff --git a/openbios-devel/libopenbios/ofmem_common.c b/openbios-devel/libopenbios/ofmem_common.c index 7f6223b..6d0f417 100644 --- a/openbios-devel/libopenbios/ofmem_common.c +++ b/openbios-devel/libopenbios/ofmem_common.c @@ -222,8 +222,8 @@ ofmem_set_property( phandle_t ph, const char *name, const char *buf, int len ) fword("encode-property"); } -static phandle_t s_phandle_memory = 0; -static phandle_t s_phandle_mmu = 0; +phandle_t s_phandle_memory = 0; +phandle_t s_phandle_mmu = 0; static void ofmem_update_mmu_translations( void ) { @@ -290,8 +290,7 @@ static void ofmem_update_memory_available( phandle_t ph, range_t *range, /* inverse of phys_range list could take 2 or more additional cells for the tail For /memory, physical addresses may be wider than one ucell. */ - prop_used = (ncells + 1) * sizeof(ucell) * - (((ph == s_phandle_memory) ? ofmem_arch_get_physaddr_cellsize() : 1) + 1); + prop_used = (ncells + 1) * sizeof(ucell) * ofmem_arch_get_available_entry_size(ph) + 1; if (prop_used > *mem_prop_size) { @@ -325,28 +324,16 @@ static void ofmem_update_memory_available( phandle_t ph, range_t *range, size = r->start - start; if (size) { - if (ph == s_phandle_memory) { - /* physical address for /memory */ - ncells += ofmem_arch_encode_physaddr(&prop[ncells], start); - } else { - /* virtual address for MMU */ - prop[ncells++] = start; - } - prop[ncells++] = size; + ofmem_arch_create_available_entry(ph, &prop[ncells], start, size); + ncells += ofmem_arch_get_available_entry_size(ph); } start = r->start + r->size; } /* tail */ if (start < top_address) { - if (ph == s_phandle_memory) { - /* physical address for /memory */ - ncells += ofmem_arch_encode_physaddr(&prop[ncells], start); - } else { - /* virtual address for MMU */ - prop[ncells++] = start; - } - prop[ncells++] = top_address - start; + ofmem_arch_create_available_entry(ph, &prop[ncells], start, top_address - start); + ncells += ofmem_arch_get_available_entry_size(ph); } ofmem_set_property(ph, "available", -- 1.7.2.3

2 2

[PATCH] sparc32: avoid runtime relocations
by Blue Swirl 04 Jan '11

04 Jan '11

The Forth dictionary was relocated at run time, incurring also a copy operation. The source dictionary remained in memory. It was not possible to run forthstrap without any input files besides the base dictionary. Make forthstrap generate a hex dump which can be included in C, but also contains relocations, so that relocations are performed by the linker at compile time. Allow dictionary compilation with no source files. Don't allocate the dictionary dynamically; reduce ofmem supply accordingly. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> --- arch/sparc32/build.xml | 6 +--- arch/sparc32/builtin.c | 9 ++++- arch/sparc32/ofmem_sparc32.c | 2 +- arch/sparc32/openbios.c | 10 ++--- include/libopenbios/sys_info.h | 2 + kernel/bootstrap.c | 71 +++++++++++++++++++++++++++++++++++---- 6 files changed, 78 insertions(+), 22 deletions(-) diff --git a/arch/sparc32/build.xml b/arch/sparc32/build.xml index 3d2f71d..47ad01a 100644 --- a/arch/sparc32/build.xml +++ b/arch/sparc32/build.xml @@ -42,11 +42,7 @@ <executable name="target/include/static-dict.h" target="target" condition="IMAGE_ELF_EMBEDDED"> <rule><![CDATA[ - $(call quiet-command,true, " GEN $(TARGET_DIR)$@") - @echo "static const char forth_dictionary[] = {" > $@ - @cat $< | hexdump -ve '1/0 "\t" 8/1 "0x%02x, " 1/0 "\n"' \ - | sed 's/0x ,//g' >> $@ - @echo "};" >> $@]]></rule> + $(call quiet-command,$(ODIR)/forthstrap -x -D $@ -d $< </dev/null, " GEN $(TARGET_DIR)$@")]]></rule> <external-object source="openbios-sparc32.dict"/> </executable> diff --git a/arch/sparc32/builtin.c b/arch/sparc32/builtin.c index 8bcce4c..839ffd6 100644 --- a/arch/sparc32/builtin.c +++ b/arch/sparc32/builtin.c @@ -14,12 +14,17 @@ * wrap an array around the hex'ed dictionary file */ +/* 256K for the dictionary */ +#define DICTIONARY_SIZE (256 * 1024 / sizeof(ucell)) + #include "static-dict.h" void collect_multiboot_info(struct sys_info *info); void collect_multiboot_info(struct sys_info *info) { info->dict_start=(unsigned long *)forth_dictionary; - info->dict_end=(unsigned long *)((ucell)forth_dictionary + - sizeof(forth_dictionary)); + info->dict_end = (unsigned long *)FORTH_DICTIONARY_END; + info->dict_last = (ucell *)((unsigned char *)forth_dictionary + + FORTH_DICTIONARY_LAST); + info->dict_limit = sizeof(forth_dictionary); } diff --git a/arch/sparc32/ofmem_sparc32.c b/arch/sparc32/ofmem_sparc32.c index 6815349..72079b2 100644 --- a/arch/sparc32/ofmem_sparc32.c +++ b/arch/sparc32/ofmem_sparc32.c @@ -21,7 +21,7 @@ #define OF_MALLOC_BASE ((char*)OFMEM + ALIGN_SIZE(sizeof(ofmem_t), 8)) -#define MEMSIZE (512 * 1024) +#define MEMSIZE (256 * 1024) static union { char memory[MEMSIZE]; ofmem_t ofmem; diff --git a/arch/sparc32/openbios.c b/arch/sparc32/openbios.c index c940a5f..1d8842a 100644 --- a/arch/sparc32/openbios.c +++ b/arch/sparc32/openbios.c @@ -28,7 +28,6 @@ #include "libopenbios/ofmem.h" #define MEMORY_SIZE (16*1024) /* 16K ram for hosted system */ -#define DICTIONARY_SIZE (256*1024) /* 256K for the dictionary */ #define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" #define FW_CFG_SUN4M_DEPTH (FW_CFG_ARCH_LOCAL + 0x00) @@ -968,12 +967,11 @@ int openbios(void) collect_sys_info(&sys_info); - dict = malloc(DICTIONARY_SIZE); - dictlimit = DICTIONARY_SIZE; + dict = (unsigned char *)sys_info.dict_start; + dicthead = (cell)sys_info.dict_end; + last = sys_info.dict_last; + dictlimit = sys_info.dict_limit; - load_dictionary((char *)sys_info.dict_start, - (unsigned long)sys_info.dict_end - - (unsigned long)sys_info.dict_start); forth_init(); #ifdef CONFIG_DEBUG_BOOT diff --git a/include/libopenbios/sys_info.h b/include/libopenbios/sys_info.h index 2eea9af..a8b3cce 100644 --- a/include/libopenbios/sys_info.h +++ b/include/libopenbios/sys_info.h @@ -20,6 +20,8 @@ struct sys_info { } *memrange; unsigned long *dict_start; unsigned long *dict_end; + cell dict_limit; + ucell *dict_last; }; extern void *elf_boot_notes; diff --git a/kernel/bootstrap.c b/kernel/bootstrap.c index 94aaeb8..68fe5dd 100644 --- a/kernel/bootstrap.c +++ b/kernel/bootstrap.c @@ -237,6 +237,48 @@ static void write_dictionary(const char *filename) #endif } +static void write_dictionary_hex(const char *filename) +{ + FILE *f; + ucell *walk; + + f = fopen(filename, "w"); + if (!f) { + printk("panic: can't write to dictionary '%s'.\n", filename); + exit(1); + } + + fprintf(f, "static ucell forth_dictionary[DICTIONARY_SIZE] = {\n"); + for (walk = (ucell *)dict; walk < (ucell *)(dict + dicthead); walk++) { + int pos, bit, l; + ucell val; + + l = (walk - (ucell *)dict); + pos = l / BITS; + bit = l & ~(-BITS); + + val = read_ucell(walk); + if (relocation_address[pos] & target_ucell((ucell)1ULL << bit)) { + fprintf(f, "(ucell)((char *)&forth_dictionary + 0x%" FMT_CELL_x + "),\n", val); + } else { + fprintf(f, "0x%" FMT_CELL_x",\n", val); + } + } + + fprintf(f, "};\n"); + + fprintf(f, "#define FORTH_DICTIONARY_LAST 0x%" FMT_CELL_x"\n", + (ucell)((unsigned long)last - (unsigned long)dict)); + fprintf(f, "#define FORTH_DICTIONARY_END 0x%" FMT_CELL_x"\n", + (ucell)dicthead); + fclose(f); + +#ifdef CONFIG_DEBUG_DICTIONARY + printk("wrote dictionary to file %s.\n", filename); +#endif +} + static ucell read_dictionary(char *fil) { int ilen; @@ -1032,7 +1074,8 @@ static void new_dictionary(const char *source) " write kernel console output to log file\n" \ " -s|--segfault install segfault handler\n" \ " -M|--dependency-dump file\n" \ - " dump dependencies in Makefile format\n\n" + " dump dependencies in Makefile format\n\n" \ + " -x|--hexdump output format is C language hex dump\n" #else #define USAGE "Usage: %s [options] [dictionary file|source file]\n\n" \ " -h show this help\n" \ @@ -1045,8 +1088,9 @@ static void new_dictionary(const char *source) " write to output.dict\n" \ " -c output.log\n" \ " write kernel console output to log file\n" \ - " -s install segfault handler\n\n" - " -M file dump dependencies in Makefile format\n\n" + " -s install segfault handler\n\n" \ + " -M file dump dependencies in Makefile format\n\n" \ + " -x output format is C language hex dump\n" #endif int main(int argc, char *argv[]) @@ -1054,15 +1098,15 @@ int main(int argc, char *argv[]) struct sigaction sa; unsigned char *ressources=NULL; /* All memory used by us */ - char *dictname = NULL; + const char *dictname = NULL; char *basedict = NULL; char *consolefile = NULL; char *depfilename = NULL; unsigned char *bootstrapdict[2]; - int c, cnt; + int c, cnt, hexdump = 0; - const char *optstring = "VvhsI:d:D:c:M:?"; + const char *optstring = "VvhsI:d:D:c:M:x?"; while (1) { #ifdef __GLIBC__ @@ -1077,6 +1121,7 @@ int main(int argc, char *argv[]) {"target-dictionary", 1, NULL, 'D'}, {"console", 1, NULL, 'c'}, {"dependency-dump", 1, NULL, 'M'}, + {"hexdump", 0, NULL, 'x'}, }; /* @@ -1132,11 +1177,17 @@ int main(int argc, char *argv[]) depfilename = optarg; } break; + case 'x': + hexdump = 1; + break; default: return 1; } } + if (!dictname) { + dictname = "bootstrap.dict"; + } if (verbose) { printk(BANNER); printk("Using source dictionary '%s'\n", basedict); @@ -1144,7 +1195,7 @@ int main(int argc, char *argv[]) printk("Dumping dependencies to '%s'\n", depfilename); } - if (argc < optind + 1) { + if (argc < optind) { printk(USAGE, argv[0]); return 1; } @@ -1243,7 +1294,11 @@ int main(int argc, char *argv[]) #endif { relocation_table( bootstrapdict[0], bootstrapdict[1], dicthead); - write_dictionary( dictname ? dictname : "bootstrap.dict"); + if (hexdump) { + write_dictionary_hex(dictname); + } else { + write_dictionary(dictname); + } } free(ressources); -- 1.6.2.4

2 2

Analysis of current Solaris 8 boot failure on SPARC32
by Mark Cave-Ayland 04 Jan '11

04 Jan '11

Hi all, Currently attempting to boot a Solaris 8 install CD results in the following output: Configuration device id QEMU version 1 machine id 32 CPUs: 1 x FMI,MB86904 UUID: 00000000-0000-0000-0000-000000000000 Welcome to OpenBIOS v1.0 built on Jan 2 2011 00:28 Type 'help' for detailed information Trying cdrom:d... Not a bootable ELF image Loading a.out image... Loaded 7680 bytes entry point is 0x4000 bootpath: /iommu/sbus/espdma/esp/sd@2,0:d Jumping to entry point 00004000 for type 00000005... switching to new context: SunOS Release 5.8 Version Generic_108528-09 32-bit Copyright 1983-2001 Sun Microsystems, Inc. All rights reserved. qemu: fatal: Trap 0x29 while interrupts disabled, Error state pc: f004127c npc: f0041280 General Registers: %g0-7: 00000000 00000808 00000001 f0041b74 00000000 f0243b88 00000000 f0244020 Current Register Window: %o0-7: f025831c f5a0f00c f0240374 f0240370 f024036c 00000004 f0240300 f005bd84 %l0-7: 04400cc2 f005bf94 f005bf98 00000004 00000209 00000004 00000000 f023fe60 %i0-7: 00000001 f02403f4 f5a0f00c f025831c 00000001 00000009 f023ff08 f005c6b8 Floating Point Registers: %f00: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 %f04: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 %f08: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 %f12: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 %f16: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 %f20: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 %f24: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 %f28: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 psr: 04000cc2 (icc: ---- SPE: SP-) wim: 00000004 fsr: 00080000 y: 00000000 Aborted With the SPARC32 OFMEM migration complete, we can now get lots of debugging information regarding the memory mappings being made at run time. Setting a breakpoint at the crash address, it is possible to see that it is part of a loop that called several times during boot. Using this we can compare the successful iterations of the loop with the failing version in order to determine where the crash is happening. Here is the gdb output from the last successful iteration of the loop: Breakpoint 1, 0xf004127c in ?? () (gdb) disas 0xf0041270 0xf00412a0 Dump of assembler code from 0xf0041270 to 0xf00412a0: 0xf0041270: rett %l2 + 4 0xf0041274: b 0xf004127c 0xf0041278: nop 0xf004127c: mov 1, %l5 ! 0x1 0xf0041280: sll %l5, %l0, %l5 0xf0041284: rd %wim, %l3 0xf0041288: btst 0x40, %l0 0xf004128c: be 0xf0041318 0xf0041290: btst %l3, %l5 0xf0041294: sub %fp, 0xa8, %l7 0xf0041298: st %g1, [ %l7 + 0x6c ] 0xf004129c: std %g2, [ %l7 + 0x70 ] End of assembler dump. (gdb) info regi g0 0x0 0 g1 0x808 2056 g2 0xf5a0f000 -174002176 g3 0x19 25 g4 0x0 0 g5 0xf0243b88 -266060920 g6 0x0 0 g7 0xf0244020 -266059744 o0 0x0 0 o1 0xf02406b4 -266074444 o2 0xf5a0f00c -174002164 o3 0xf0258398 -265976936 o4 0xf0252b10 -265999600 o5 0x0 0 sp 0xf0240658 0xf0240658 o7 0xf0041b74 -268166284 l0 0x4400cc0 71306432 l1 0xf004b1f8 -268127752 l2 0xf004b1fc -268127748 l3 0xf0041000 -268169216 l4 0x209 521 l5 0x1 1 l6 0x7 7 l7 0xf0240658 -266074536 i0 0xf024d870 -266020752 i1 0x0 0 i2 0xff812201 -8314367 i3 0x0 0 i4 0x0 0 i5 0xf01582dc -267025700 fp 0xf0240290 0xf0240290 i7 0xf004ef98 -268111976 y 0x0 0 psr 0x4400cc0 [ PS S #10 #11 #22 #26 ] wim 0x1 1 tbr 0xf0040090 -268173168 pc 0xf004127c 0xf004127c npc 0xf0041280 0xf0041280 fsr 0x80000 [ #19 ] csr 0x0 0 (gdb) stepi 0xf0041280 in ?? () (gdb) 0xf0041284 in ?? () (gdb) 0xf0041288 in ?? () (gdb) 0xf004128c in ?? () (gdb) 0xf0041290 in ?? () (gdb) 0xf0041294 in ?? () (gdb) 0xf0041298 in ?? () (gdb) 0xf004129c in ?? () (gdb) info regi g0 0x0 0 g1 0x808 2056 g2 0xf5a0f000 -174002176 g3 0x19 25 g4 0x0 0 g5 0xf0243b88 -266060920 g6 0x0 0 g7 0xf0244020 -266059744 o0 0x0 0 o1 0xf02406b4 -266074444 o2 0xf5a0f00c -174002164 o3 0xf0258398 -265976936 o4 0xf0252b10 -265999600 o5 0x0 0 sp 0xf0240658 0xf0240658 o7 0xf0041b74 -268166284 l0 0x4400cc0 71306432 l1 0xf004b1f8 -268127752 l2 0xf004b1fc -268127748 l3 0x1 1 l4 0x209 521 l5 0x1 1 l6 0x7 7 l7 0xf02401e8 -266075672 i0 0xf024d870 -266020752 i1 0x0 0 i2 0xff812201 -8314367 i3 0x0 0 i4 0x0 0 i5 0xf01582dc -267025700 fp 0xf0240290 0xf0240290 i7 0xf004ef98 -268111976 y 0x0 0 psr 0x4000cc0 [ PS S #10 #11 #26 ] wim 0x1 1 tbr 0xf0040090 -268173168 pc 0xf004129c 0xf004129c npc 0xf00412a0 0xf00412a0 fsr 0x80000 [ #19 ] csr 0x0 0 And here is the failing version: (gdb) info regi g0 0x0 0 g1 0x80 128 g2 0xf5a0f000 -174002176 g3 0x1a 26 g4 0x0 0 g5 0xf0243b88 -266060920 g6 0x0 0 g7 0xf0244020 -266059744 o0 0x0 0 o1 0xf024047c -266075012 o2 0xf5a0f00c -174002164 o3 0xf0258398 -265976936 o4 0xf0252b10 -265999600 o5 0x0 0 sp 0xf0240420 0xf0240420 o7 0xf0041b74 -268166284 l0 0x4400cc4 71306436 l1 0xf004b1f8 -268127752 l2 0xf004b1fc -268127748 l3 0x10 16 l4 0x209 521 l5 0x10 16 l6 0x7 7 l7 0xf023ffb0 -266076240 i0 0xf5a0f01c -174002148 i1 0x100 256 i2 0xf0000000 -268435456 i3 0xff000000 -16777216 i4 0x4100cc5 68160709 i5 0x4100ce5 68160741 fp 0xf0240058 0xf0240058 i7 0xf0054be8 -268088344 y 0x0 0 psr 0x4000cc4 [ #2 PS S #10 #11 #26 ] wim 0x10 16 tbr 0xf0040090 -268173168 pc 0xf00412a4 0xf00412a4 npc 0xf00412a8 0xf00412a8 fsr 0x80000 [ #19 ] csr 0x0 0 (gdb) cont Continuing. Breakpoint 1, 0xf004127c in ?? () (gdb) stepi 0xf0041280 in ?? () (gdb) 0xf0041284 in ?? () (gdb) 0xf0041288 in ?? () (gdb) 0xf004128c in ?? () (gdb) 0xf0041290 in ?? () (gdb) 0xf0041294 in ?? () (gdb) 0xf0041298 in ?? () (gdb) Remote connection closed (gdb) So the failure appears to be happening on this instruction: 0xf0041298: st %g1, [ %l7 + 0x6c ] For the successful iteration: l7 0xf02401e8 -266075672 For the failing iteration: l7 0xf023ffb0 -266076240 With OFMEM debugging enabled, it's fairly easy to see the following in the console output: Jumping to entry point 00004000 for type 00000005... switching to new context: OFMEM: ofmem_claim phys=ffffffffffffffff size=00040000 align=00000008 OFMEM: ofmem_claim_virt virt=f0040000 size=00040000 align=00000000 OFMEM: ofmem_map_page_range f0040000 -> 006fc0000 00040000 mode 000000bc OFMEM: ofmem_claim phys=ffffffffffffffff size=00019000 align=00000008 OFMEM: ofmem_claim_virt virt=f0240000 size=00019000 align=00000000 OFMEM: ofmem_map_page_range f0240000 -> 006fa7000 00019000 mode 000000bc So what is happening is that %l7 is getting set to below 0xf0240000 and hence the trap is triggered because the kernel is attempting to write to unmapped virtual memory. Using Artyom's blog, I was able to fire up kadb to try and figure out which part of the kernel is raising the exception: kadb[0]: 0xf004127c? sys_trap: sys_trap: aa102001 = mov 0x1, %l5 kadb[0]: Based upon this, it would seem that the Solaris kernel allocates a stack for saving state when a trap is called with a base of 0xf0240000, but for some reason we are stacking to a point where we go beyond the memory region allocated for it. I suspect that this is a side effect of a property/device not being setup correctly, but I'm not yet sure what it is. Anyhow, I thought I'd post the results of my investigations so far in case anyone else has any ideas as to what could cause this. ATB, Mark. -- Mark Cave-Ayland - Senior Technical Architect PostgreSQL - PostGIS Sirius Corporation plc - control through freedom http://www.siriusit.co.uk t: +44 870 608 0063 Sirius Labs: http://www.siriusit.co.uk/labs

5 12

[commit] r1013 - in trunk/openbios-devel: . config/xml kernel
by repository service 02 Jan '11

02 Jan '11

Author: blueswirl Date: Sun Jan 2 10:56:19 2011 New Revision: 1013 URL: http://tracker.coreboot.org/trac/openbios/changeset/1013 Log: Generate Makefile dependencies also from Forth files Dependencies between Forth files were not detected, so dictionaries were not regenerated automatically in some cases. Introduce '-M' flag to forthstrap to dump dependency information in Makefile compatible format, based on the Forth 'include' directives. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/Makefile.target trunk/openbios-devel/config/xml/dictionary.xsl trunk/openbios-devel/kernel/bootstrap.c Modified: trunk/openbios-devel/Makefile.target ============================================================================== --- trunk/openbios-devel/Makefile.target Sun Jan 2 02:32:17 2011 (r1012) +++ trunk/openbios-devel/Makefile.target Sun Jan 2 10:56:19 2011 (r1013) @@ -77,4 +77,4 @@ include rules.mak # Include automatically generated dependency files --include $(wildcard $(ODIR)/host/kernel/*.d $(ODIR)/target/*/*.d $(ODIR)/target/*/*/*.d $(ODIR)/target/*/*/*/*.d) +-include $(wildcard $(ODIR)/*.d $(ODIR)/host/kernel/*.d $(ODIR)/target/*/*.d $(ODIR)/target/*/*/*.d $(ODIR)/target/*/*/*/*.d) Modified: trunk/openbios-devel/config/xml/dictionary.xsl ============================================================================== --- trunk/openbios-devel/config/xml/dictionary.xsl Sun Jan 2 02:32:17 2011 (r1012) +++ trunk/openbios-devel/config/xml/dictionary.xsl Sun Jan 2 10:56:19 2011 (r1013) @@ -126,6 +126,7 @@ <xsl:text> -I$(ODIR)/forth</xsl:text> <xsl:text> -D $@</xsl:text> + <xsl:text> -M $@.d</xsl:text> <xsl:if test="$init!=''"> <xsl:text> -d $(ODIR)/</xsl:text><xsl:value-of select="$init"/><xsl:text>.dict</xsl:text> </xsl:if> Modified: trunk/openbios-devel/kernel/bootstrap.c ============================================================================== --- trunk/openbios-devel/kernel/bootstrap.c Sun Jan 2 02:32:17 2011 (r1012) +++ trunk/openbios-devel/kernel/bootstrap.c Sun Jan 2 10:56:19 2011 (r1013) @@ -69,6 +69,7 @@ }; static include includes = { ".", NULL }; +static FILE *depfile; static ucell * relocation_address=NULL; static int relocation_length=0; @@ -465,6 +466,10 @@ srclines [ cursrc ] = 1; srcfiles [ cursrc++ ] = ret; + if (depfile) { + fprintf(depfile, " %s", fullpath); + } + return ret; } @@ -1025,7 +1030,9 @@ " write to output.dict\n" \ " -c|--console output.log\n" \ " write kernel console output to log file\n" \ - " -s|--segfault install segfault handler\n\n" + " -s|--segfault install segfault handler\n" \ + " -M|--dependency-dump file\n" \ + " dump dependencies in Makefile format\n\n" #else #define USAGE "Usage: %s [options] [dictionary file|source file]\n\n" \ " -h show this help\n" \ @@ -1039,7 +1046,7 @@ " -c output.log\n" \ " write kernel console output to log file\n" \ " -s install segfault handler\n\n" - + " -M file dump dependencies in Makefile format\n\n" #endif int main(int argc, char *argv[]) @@ -1050,11 +1057,12 @@ char *dictname = NULL; char *basedict = NULL; char *consolefile = NULL; + char *depfilename = NULL; unsigned char *bootstrapdict[2]; int c, cnt; - const char *optstring = "VvhsI:d:D:c:?"; + const char *optstring = "VvhsI:d:D:c:M:?"; while (1) { #ifdef __GLIBC__ @@ -1068,6 +1076,7 @@ {"source-dictionary", 1, NULL, 'd'}, {"target-dictionary", 1, NULL, 'D'}, {"console", 1, NULL, 'c'}, + {"dependency-dump", 1, NULL, 'M'}, }; /* @@ -1118,6 +1127,11 @@ consolefile = optarg; } break; + case 'M': + if (!depfilename) { + depfilename = optarg; + } + break; default: return 1; } @@ -1127,6 +1141,7 @@ printk(BANNER); printk("Using source dictionary '%s'\n", basedict); printk("Dumping final dictionary to '%s'\n", dictname); + printk("Dumping dependencies to '%s'\n", depfilename); } if (argc < optind + 1) { @@ -1134,6 +1149,15 @@ return 1; } + if (depfilename) { + depfile = fopen(depfilename, "w"); + if (!depfile) { + printk("panic: can't write to dependency file '%s'.\n", + depfilename); + exit(1); + } + fprintf(depfile, "%s:", dictname); + } /* * Get all required resources @@ -1203,6 +1227,11 @@ run_dictionary(basedict, consolefile); } + if (depfile) { + fprintf(depfile, "\n"); + fclose(depfile); + depfile = NULL; + } if(errors) break; }

1 0

Re: [OpenBIOS] [PATCH 00/13] Convert SPARC32 to OFMEM v2
by Blue Swirl 02 Jan '11

02 Jan '11

On Thu, Dec 30, 2010 at 11:22 PM, Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> wrote: > This patchset converts SPARC32 and its associated devices over from > its own private memory routines over to using the OFMEM API as used > by PPC and SPARC64. For all patches: Tested-by: Blue Swirl <blauwirbel(a)gmail.com> Reviewed-by: Blue Swirl <blauwirbel(a)gmail.com>

2 2

[commit] r1012 - trunk/openbios-devel/arch/sparc32
by repository service 02 Jan '11

02 Jan '11

Author: mcayland Date: Sun Jan 2 02:32:17 2011 New Revision: 1012 URL: http://tracker.coreboot.org/trac/openbios/changeset/1012 Log: Add extra debugging to display the parameters being passed to obp_fortheval_v2() on SPARC32. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc32/romvec.c Modified: trunk/openbios-devel/arch/sparc32/romvec.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/romvec.c Sun Jan 2 01:39:04 2011 (r1011) +++ trunk/openbios-devel/arch/sparc32/romvec.c Sun Jan 2 02:32:17 2011 (r1012) @@ -442,7 +442,7 @@ PUSH(arg1); PUSH(arg0); - DPRINTF("obp_fortheval_v2(%s)\n", str); + DPRINTF("obp_fortheval_v2(%x %x %x %x %x %s)\n", arg4, arg3, arg2, arg1, arg0, str); push_str(str); fword("eval");

1 0

[commit] r1011 - trunk/openbios-devel/drivers
by repository service 02 Jan '11

02 Jan '11

Author: mcayland Date: Sun Jan 2 01:39:04 2011 New Revision: 1011 URL: http://tracker.coreboot.org/trac/openbios/changeset/1011 Log: Register SPARC32 auxio device and correctly encode virtual addresses in the OBIO device tree. Once the auxio device is registered, we must also correct the address properties which currently set a 64-bit rather than a 32-bit property. This fixes error messages related to auxio when attempting to boot a Solaris 8 CD. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/drivers/obio.c Modified: trunk/openbios-devel/drivers/obio.c ============================================================================== --- trunk/openbios-devel/drivers/obio.c Sun Jan 2 01:07:34 2011 (r1010) +++ trunk/openbios-devel/drivers/obio.c Sun Jan 2 01:39:04 2011 (r1011) @@ -75,9 +75,6 @@ PUSH(addr); fword("encode-int"); - PUSH(4); - fword("encode-int"); - fword("encode+"); push_str("address"); fword("property"); return addr; @@ -228,7 +225,7 @@ { ob_new_obio_device("auxio", NULL); - ob_reg(base, offset, AUXIO_REGS, 0); + ob_reg(base, offset, AUXIO_REGS, 1); fword("finish-device"); }

1 0

[commit] r1010 - trunk/openbios-devel/include/arch/sparc32
by repository service 02 Jan '11

02 Jan '11

Author: mcayland Date: Sun Jan 2 01:07:34 2011 New Revision: 1010 URL: http://tracker.coreboot.org/trac/openbios/changeset/1010 Log: Fix the FMT_cell and FMT_ucell definitions for SPARC32. This is required to enable a build with CONFIG_DEBUG_OFMEM set to true to complete successfully. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Tested-by: Blue Swirl <blauwirbel(a)gmail.com> Reviewed-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/include/arch/sparc32/types.h Modified: trunk/openbios-devel/include/arch/sparc32/types.h ============================================================================== --- trunk/openbios-devel/include/arch/sparc32/types.h Sun Jan 2 01:07:26 2011 (r1009) +++ trunk/openbios-devel/include/arch/sparc32/types.h Sun Jan 2 01:07:34 2011 (r1010) @@ -26,6 +26,8 @@ typedef long long int64_t; typedef long intptr_t; +#define PRId32 "d" +#define PRIu32 "u" #define PRIx32 "x" #define PRIx64 "llx" #endif @@ -46,8 +48,8 @@ typedef long long dcell; typedef unsigned long long ducell; -#define FMT_cell "%ld" -#define FMT_ucell "%lu" +#define FMT_cell "%" PRId32 +#define FMT_ucell "%" PRIu32 #define FMT_ucellx "%08x" #define FMT_ucellX "%08X"

1 0

[commit] r1009 - in trunk/openbios-devel: arch/sparc32 drivers include/libopenbios
by repository service 02 Jan '11

02 Jan '11

Author: mcayland Date: Sun Jan 2 01:07:26 2011 New Revision: 1009 URL: http://tracker.coreboot.org/trac/openbios/changeset/1009 Log: Switch remaining SPARC32 code over to OFMEM. This patch removes the SPARC32-specific map_pages() function from the IOMMU driver, plus switches obp_dumb_memalloc() over to use OFMEM. OFMEM property generation is enabled for the /memory and /virtual-memory nodes, and any remaining traces of the old memory variables are removed. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Tested-by: Blue Swirl <blauwirbel(a)gmail.com> Reviewed-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc32/lib.c trunk/openbios-devel/drivers/iommu.c trunk/openbios-devel/include/libopenbios/ofmem.h Modified: trunk/openbios-devel/arch/sparc32/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/lib.c Sun Jan 2 01:07:19 2011 (r1008) +++ trunk/openbios-devel/arch/sparc32/lib.c Sun Jan 2 01:07:26 2011 (r1009) @@ -53,8 +53,6 @@ char *curp; }; -static struct mem cmem; /* Current memory, virtual */ -static struct mem cio; /* Current I/O space */ struct mem cdvmem; /* Current device virtual memory space */ unsigned int va_shift; @@ -190,7 +188,7 @@ return pa2va(pa); } -void +static void map_pages(phys_addr_t phys, unsigned long virt, unsigned long size, unsigned long mode) { @@ -353,29 +351,19 @@ char *obp_dumb_memalloc(char *va, unsigned int size) { - size = (size + 7) & ~7; - // XXX should use normal memory alloc - totavail[0].num_bytes -= size; - DPRINTF("obp_dumb_memalloc va 0x%p size %x at 0x%x\n", va, size, - totavail[0].num_bytes); - - // If va is null, the allocator is supposed to pick a "suitable" address. - // (See OpenSolaric prom_alloc.c) There's not any real guidance as - // to what might be "suitable". So we mimic the behavior of a Sun boot - // ROM. - - if (va == NULL) { - va = (char *)(totmap[0].start_adr - size); - totmap[0].start_adr -= size; - totmap[0].num_bytes += size; - DPRINTF("obp_dumb_memalloc req null -> 0x%p\n", va); - } + phys_addr_t phys; + ucell virt; - map_pages(totavail[0].num_bytes, (unsigned long)va, size, ofmem_arch_default_translation_mode(totavail[0].num_bytes)); + /* Claim physical memory */ + phys = ofmem_claim_phys(-1, size, CONFIG_OFMEM_MALLOC_ALIGN); - update_memory_properties(); + /* Claim virtual memory */ + virt = ofmem_claim_virt(pointer2cell(va), size, 0); - return va; + /* Map the memory */ + ofmem_map(phys, virt, size, ofmem_arch_default_translation_mode(phys)); + + return cell2pointer(virt); } void obp_dumb_memfree(__attribute__((unused))char *va, @@ -387,6 +375,8 @@ void ob_init_mmu(void) { + ucell *reg; + init_romvec_mem(); /* Find the phandles for the /memory and /virtual-memory nodes */ @@ -400,30 +390,18 @@ POP(); s_phandle_mmu = POP(); - /* Setup /memory:reg (totphys) property */ - push_str("/memory"); - fword("find-device"); - PUSH(pointer2cell(mem_reg)); - PUSH(3 * sizeof(ucell)); - push_str("reg"); - PUSH_ph(s_phandle_memory); - fword("encode-property"); + ofmem_register(s_phandle_memory, s_phandle_mmu); - /* Setup /virtual-memory:avail (totmap) property */ - push_str("/virtual-memory"); - fword("find-device"); - PUSH(pointer2cell(virt_avail)); - PUSH(3 * sizeof(ucell)); - push_str("available"); - PUSH_ph(s_phandle_mmu); - fword("encode-property"); + /* Setup /memory:reg (totphys) property */ + reg = malloc(3 * sizeof(ucell)); + ofmem_arch_encode_physaddr(reg, 0); /* physical base */ + reg[2] = (ucell)ofmem_arch_get_phys_top(); /* size */ - /* Setup /memory:avail (totavail) property */ push_str("/memory"); fword("find-device"); - PUSH(pointer2cell(mem_avail)); + PUSH(pointer2cell(reg)); PUSH(3 * sizeof(ucell)); - push_str("available"); + push_str("reg"); PUSH_ph(s_phandle_memory); fword("encode-property"); @@ -444,9 +422,6 @@ unsigned long pa, va; int size; - mem_init(&cmem, (char *) &_vmem, (char *)&_evmem); - mem_init(&cio, (char *)&_end, (char *)&_iomem); - ofmem_posix_memalign((void *)&context_table, NCTX_SWIFT * sizeof(int), NCTX_SWIFT * sizeof(int)); ofmem_posix_memalign((void *)&l1, 256 * sizeof(int), 256 * sizeof(int)); Modified: trunk/openbios-devel/drivers/iommu.c ============================================================================== --- trunk/openbios-devel/drivers/iommu.c Sun Jan 2 01:07:19 2011 (r1008) +++ trunk/openbios-devel/drivers/iommu.c Sun Jan 2 01:07:26 2011 (r1009) @@ -68,7 +68,7 @@ */ mva = (unsigned int) va; mpa = (unsigned int) pa; - map_pages(mpa, mva, npages * PAGE_SIZE, ofmem_arch_io_translation_mode(mpa)); + ofmem_arch_early_map_pages(mpa, mva, npages * PAGE_SIZE, ofmem_arch_io_translation_mode(mpa)); /* * Map into IOMMU page table. Modified: trunk/openbios-devel/include/libopenbios/ofmem.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/ofmem.h Sun Jan 2 01:07:19 2011 (r1008) +++ trunk/openbios-devel/include/libopenbios/ofmem.h Sun Jan 2 01:07:26 2011 (r1009) @@ -135,7 +135,6 @@ void mem_init(struct mem *t, char *begin, char *limit); void *mem_alloc(struct mem *t, int size, int align); -void map_pages(phys_addr_t phys, unsigned long virt, unsigned long size, unsigned long mode); #endif #ifdef PAGE_SHIFT

1 0

[commit] r1008 - in trunk/openbios-devel: arch/sparc32 drivers include/libopenbios
by repository service 02 Jan '11

02 Jan '11

Author: mcayland Date: Sun Jan 2 01:07:19 2011 New Revision: 1008 URL: http://tracker.coreboot.org/trac/openbios/changeset/1008 Log: Switch all SPARC32 devices over from the private map_io() function over to OFMEM's ofmem_map_io() function. The old map_io() function can now be removed. Also fill in ofmem_arch_early_map_pages() on SPARC32 which is required for ofmem_map_io() to work correctly. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Tested-by: Blue Swirl <blauwirbel(a)gmail.com> Reviewed-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc32/console.c trunk/openbios-devel/arch/sparc32/lib.c trunk/openbios-devel/drivers/escc.c trunk/openbios-devel/drivers/esp.c trunk/openbios-devel/drivers/fw_cfg.c trunk/openbios-devel/drivers/iommu.c trunk/openbios-devel/drivers/obio.c trunk/openbios-devel/drivers/sbus.c trunk/openbios-devel/include/libopenbios/ofmem.h Modified: trunk/openbios-devel/arch/sparc32/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/console.c Sun Jan 2 01:06:59 2011 (r1007) +++ trunk/openbios-devel/arch/sparc32/console.c Sun Jan 2 01:07:19 2011 (r1008) @@ -46,8 +46,8 @@ void tcx_init(uint64_t base) { - vmem = map_io(base + VMEM_BASE, VMEM_SIZE); - dac = map_io(base + DAC_BASE, DAC_SIZE); + vmem = (unsigned char *)ofmem_map_io(base + VMEM_BASE, VMEM_SIZE); + dac = (uint32_t *)ofmem_map_io(base + DAC_BASE, DAC_SIZE); console_init(); } Modified: trunk/openbios-devel/arch/sparc32/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/lib.c Sun Jan 2 01:06:59 2011 (r1007) +++ trunk/openbios-devel/arch/sparc32/lib.c Sun Jan 2 01:07:19 2011 (r1008) @@ -218,29 +218,6 @@ } /* - * Create an I/O mapping to pa[size]. - * Returns va of the mapping or 0 if unsuccessful. - */ -void * -map_io(uint64_t pa, int size) -{ - unsigned long va; - unsigned int npages; - unsigned int off; - - off = pa & (PAGE_SIZE - 1); - npages = (off + size - 1) / PAGE_SIZE + 1; - pa &= ~(PAGE_SIZE - 1); - - va = (unsigned long)mem_alloc(&cio, npages * PAGE_SIZE, PAGE_SIZE); - if (va == 0) - return NULL; - - map_pages(pa, va, npages * PAGE_SIZE, ofmem_arch_io_translation_mode(pa)); - return (void *)(va + off); -} - -/* * D5.3 pgmap@ ( va -- pte ) */ static void @@ -371,7 +348,7 @@ void ofmem_arch_early_map_pages(phys_addr_t phys, ucell virt, ucell size, ucell mode) { - /* Currently do nothing */ + map_pages(phys, virt, size, mode); } char *obp_dumb_memalloc(char *va, unsigned int size) Modified: trunk/openbios-devel/drivers/escc.c ============================================================================== --- trunk/openbios-devel/drivers/escc.c Sun Jan 2 01:06:59 2011 (r1007) +++ trunk/openbios-devel/drivers/escc.c Sun Jan 2 01:07:19 2011 (r1008) @@ -105,7 +105,7 @@ int uart_init(phys_addr_t port, unsigned long speed) { #ifdef CONFIG_DRIVER_ESCC_SUN - serial_dev = map_io(port & ~7ULL, ZS_REGS); + serial_dev = (unsigned char *)ofmem_map_io(port & ~7ULL, ZS_REGS); serial_dev += port & 7ULL; #else serial_dev = (unsigned char *)(uintptr_t)port; @@ -213,7 +213,7 @@ void kbd_init(phys_addr_t base) { - kbd_dev = map_io(base, 2 * 4); + kbd_dev = (unsigned char *)ofmem_map_io(base, 2 * 4); kbd_dev += 4; } Modified: trunk/openbios-devel/drivers/esp.c ============================================================================== --- trunk/openbios-devel/drivers/esp.c Sun Jan 2 01:06:59 2011 (r1007) +++ trunk/openbios-devel/drivers/esp.c Sun Jan 2 01:07:19 2011 (r1008) @@ -311,7 +311,7 @@ espdma_init(unsigned int slot, uint64_t base, unsigned long offset, struct esp_dma *espdma) { - espdma->regs = (void *)map_io(base + (uint64_t)offset, 0x10); + espdma->regs = (void *)ofmem_map_io(base + (uint64_t)offset, 0x10); if (espdma->regs == NULL) { DPRINTF("espdma_init: cannot map registers\n"); @@ -445,7 +445,7 @@ return -1; } /* Get the IO region */ - esp->ll = (void *)map_io(base + (uint64_t)espoffset, + esp->ll = (void *)ofmem_map_io(base + (uint64_t)espoffset, sizeof(struct esp_regs)); if (esp->ll == NULL) { DPRINTF("Can't map ESP registers\n"); Modified: trunk/openbios-devel/drivers/fw_cfg.c ============================================================================== --- trunk/openbios-devel/drivers/fw_cfg.c Sun Jan 2 01:06:59 2011 (r1007) +++ trunk/openbios-devel/drivers/fw_cfg.c Sun Jan 2 01:07:19 2011 (r1008) @@ -65,7 +65,7 @@ fw_cfg_init(void) { #if defined(CONFIG_SPARC32) - fw_cfg_cmd = (void *)map_io(CONFIG_FW_CFG_ADDR, 2); + fw_cfg_cmd = (void *)ofmem_map_io(CONFIG_FW_CFG_ADDR, 2); fw_cfg_data = (uint8_t *)fw_cfg_cmd + 2; #elif defined(CONFIG_SPARC64) // Nothing for the port version Modified: trunk/openbios-devel/drivers/iommu.c ============================================================================== --- trunk/openbios-devel/drivers/iommu.c Sun Jan 2 01:06:59 2011 (r1007) +++ trunk/openbios-devel/drivers/iommu.c Sun Jan 2 01:07:19 2011 (r1008) @@ -103,7 +103,7 @@ int ret; unsigned long vasize; - regs = map_io(base, IOMMU_REGS); + regs = (struct iommu_regs *)ofmem_map_io(base, IOMMU_REGS); if (regs == NULL) { DPRINTF("Cannot map IOMMU\n"); for (;;) { } Modified: trunk/openbios-devel/drivers/obio.c ============================================================================== --- trunk/openbios-devel/drivers/obio.c Sun Jan 2 01:06:59 2011 (r1007) +++ trunk/openbios-devel/drivers/obio.c Sun Jan 2 01:07:19 2011 (r1008) @@ -71,7 +71,7 @@ if (map) { unsigned long addr; - addr = (unsigned long)map_io(base + offset, size); + addr = (unsigned long)ofmem_map_io(base + offset, size); PUSH(addr); fword("encode-int"); @@ -251,7 +251,7 @@ power_reg = (void *)ob_reg(base, offset, AUXIO2_REGS, 1); // Not in device tree - reset_reg = map_io(base + (uint64_t)SLAVIO_RESET, RESET_REGS); + reset_reg = (unsigned int *)ofmem_map_io(base + (uint64_t)SLAVIO_RESET, RESET_REGS); bind_func("sparc32-reset-all", sparc32_reset_all); push_str("' sparc32-reset-all to reset-all"); @@ -297,7 +297,7 @@ fword("property"); - counter_regs = map_io(base + (uint64_t)offset, sizeof(*counter_regs)); + counter_regs = (struct sun4m_timer_regs *)ofmem_map_io(base + (uint64_t)offset, sizeof(*counter_regs)); counter_regs->cfg = 0xffffffff; counter_regs->l10_timer_limit = (((1000000/100) + 1) << 10); counter_regs->cpu_timers[0].l14_timer_limit = 0; @@ -352,7 +352,7 @@ push_str("reg"); fword("property"); - intregs = map_io(base | (uint64_t)offset, sizeof(*intregs)); + intregs = (struct sun4m_intregs *)ofmem_map_io(base | (uint64_t)offset, sizeof(*intregs)); intregs->clear = ~SUN4M_INT_MASKALL; intregs->cpu_intregs[0].clear = ~0x17fff; @@ -403,7 +403,7 @@ ob_smp_init(unsigned long mem_size) { // See arch/sparc32/entry.S for memory layout - smp_header = (struct smp_cfg *)map_io((uint64_t)(mem_size - 0x100), + smp_header = (struct smp_cfg *)ofmem_map_io((uint64_t)(mem_size - 0x100), sizeof(struct smp_cfg)); } Modified: trunk/openbios-devel/drivers/sbus.c ============================================================================== --- trunk/openbios-devel/drivers/sbus.c Sun Jan 2 01:06:59 2011 (r1007) +++ trunk/openbios-devel/drivers/sbus.c Sun Jan 2 01:07:19 2011 (r1008) @@ -49,7 +49,7 @@ push_str("reg"); fword("property"); - regs = map_io(base, SBUS_REGS); + regs = (void *)ofmem_map_io(base, SBUS_REGS); PUSH((unsigned long)regs); fword("encode-int"); push_str("address"); Modified: trunk/openbios-devel/include/libopenbios/ofmem.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/ofmem.h Sun Jan 2 01:06:59 2011 (r1007) +++ trunk/openbios-devel/include/libopenbios/ofmem.h Sun Jan 2 01:07:19 2011 (r1008) @@ -136,7 +136,6 @@ void mem_init(struct mem *t, char *begin, char *limit); void *mem_alloc(struct mem *t, int size, int align); void map_pages(phys_addr_t phys, unsigned long virt, unsigned long size, unsigned long mode); -void *map_io(uint64_t pa, int size); #endif #ifdef PAGE_SHIFT

1 0

[commit] r1007 - in trunk/openbios-devel: arch/ppc/qemu arch/sparc32 arch/sparc64 include/libopenbios libopenbios
by repository service 02 Jan '11

02 Jan '11

Author: mcayland Date: Sun Jan 2 01:06:59 2011 New Revision: 1007 URL: http://tracker.coreboot.org/trac/openbios/changeset/1007 Log: Implement ofmem_map_io() within OFMEM as a function to map I/O memory (similar to SPARC32's private map_io() function). As a consequence we need to maintain a separate I/O range within OFMEM, and add management functions similar to those that exist for the virtual and physical ranges. At the same time, we introduce a couple of new OFMEM arch functions called ofmem_arch_get_iomem_base() and ofmem_arch_get_iomem_top() to control the range of allocatable I/O memory which is again similar to the existing method used for the virtual and physical ranges. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Tested-by: Blue Swirl <blauwirbel(a)gmail.com> Reviewed-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c trunk/openbios-devel/include/libopenbios/ofmem.h trunk/openbios-devel/libopenbios/ofmem_common.c Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sun Jan 2 01:06:53 2011 (r1006) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sun Jan 2 01:06:59 2011 (r1007) @@ -132,6 +132,18 @@ /* none yet */ } +ucell ofmem_arch_get_iomem_base(void) +{ + /* Currently unused */ + return 0; +} + +ucell ofmem_arch_get_iomem_top(void) +{ + /* Currently unused */ + return 0; +} + retain_t *ofmem_arch_get_retained(void) { /* not implemented */ Modified: trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c Sun Jan 2 01:06:53 2011 (r1006) +++ trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c Sun Jan 2 01:06:59 2011 (r1007) @@ -71,6 +71,16 @@ return (uintptr_t)ofmem->ramsize - 0x1000000; } +ucell ofmem_arch_get_iomem_base(void) +{ + return pointer2cell(&_end); +} + +ucell ofmem_arch_get_iomem_top(void) +{ + return pointer2cell(&_iomem); +} + retain_t *ofmem_arch_get_retained(void) { /* Not used */ Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Sun Jan 2 01:06:53 2011 (r1006) +++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Sun Jan 2 01:06:59 2011 (r1007) @@ -70,6 +70,18 @@ return ofmem->ramsize; } +ucell ofmem_arch_get_iomem_base(void) +{ + /* Currently unused */ + return 0; +} + +ucell ofmem_arch_get_iomem_top(void) +{ + /* Currently unused */ + return 0; +} + retain_t *ofmem_arch_get_retained(void) { /* Retained area is at the top of physical RAM */ Modified: trunk/openbios-devel/include/libopenbios/ofmem.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/ofmem.h Sun Jan 2 01:06:53 2011 (r1006) +++ trunk/openbios-devel/include/libopenbios/ofmem.h Sun Jan 2 01:06:59 2011 (r1007) @@ -46,6 +46,7 @@ range_t *phys_range; range_t *virt_range; + range_t *io_range; translation_t *trans; /* this is really a translation_t */ } ofmem_t; @@ -63,6 +64,8 @@ extern ucell ofmem_arch_get_heap_top(void); extern ucell ofmem_arch_get_virt_top(void); extern phys_addr_t ofmem_arch_get_phys_top(void); +extern ucell ofmem_arch_get_iomem_base(void); +extern ucell ofmem_arch_get_iomem_top(void); extern retain_t* ofmem_arch_get_retained(void); extern int ofmem_arch_get_physaddr_cellsize(void); extern int ofmem_arch_encode_physaddr(ucell *p, phys_addr_t value); @@ -104,25 +107,27 @@ extern ucell ofmem_claim( ucell addr, ucell size, ucell align ); extern phys_addr_t ofmem_claim_phys( phys_addr_t mphys, ucell size, ucell align ); extern ucell ofmem_claim_virt( ucell mvirt, ucell size, ucell align ); +extern ucell ofmem_claim_io( ucell virt, ucell size, ucell align ); extern phys_addr_t ofmem_retain( phys_addr_t phys, ucell size, ucell align ); extern int ofmem_map( phys_addr_t phys, ucell virt, ucell size, ucell mode ); extern int ofmem_unmap( ucell virt, ucell size ); +extern ucell ofmem_map_io( phys_addr_t phys, ucell size ); 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 phys_addr_t ofmem_translate( ucell virt, ucell *ret_mode ); -#ifdef CONFIG_PPC +/* Currently the same for all architectures */ #define PAGE_SHIFT 12 +#ifdef CONFIG_PPC unsigned long get_ram_top( void ); unsigned long get_ram_bottom( void ); #elif defined(CONFIG_SPARC32) -#define PAGE_SHIFT 12 /* arch/sparc32/lib.c */ struct mem; Modified: trunk/openbios-devel/libopenbios/ofmem_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/ofmem_common.c Sun Jan 2 01:06:53 2011 (r1006) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Sun Jan 2 01:06:59 2011 (r1007) @@ -551,6 +551,35 @@ get_ram_size(), ofmem_arch_get_virt_top(), 1 ); } +static ucell ofmem_claim_io_( ucell virt, ucell size, ucell align, + ucell min, ucell max, int reverse ) +{ + ofmem_t *ofmem = ofmem_arch_get_private(); + if( !align ) { + if( !is_free( virt, size, ofmem->io_range ) ) { + OFMEM_TRACE("Non-free I/O memory claimed!\n"); + return -1; + } + add_entry( virt, size, &ofmem->io_range ); + return virt; + } + + virt = find_area( align, size, ofmem->io_range, min, max, reverse ); + if( virt == -1 ) { + printk("ofmem_claim_io - out of space (failed request for " FMT_ucellx " bytes)\n", size); + return -1; + } + add_entry( virt, size, &ofmem->io_range ); + return virt; +} + +ucell ofmem_claim_io( ucell virt, ucell size, ucell align ) +{ + /* Claim a section of memory from the I/O range */ + return ofmem_claim_io_( virt, size, align, + ofmem_arch_get_iomem_base(), ofmem_arch_get_iomem_top(), 0 ); +} + /* if align != 0, phys is ignored. Returns -1 on error */ phys_addr_t ofmem_retain( phys_addr_t phys, ucell size, ucell align ) { @@ -797,6 +826,29 @@ return 0; } +ucell ofmem_map_io( phys_addr_t phys, ucell size ) +{ + /* Claim virtual memory from the I/O range and map the page-aligned + physical address phys to it, returning the newly allocated + virtual address */ + ucell virt, mode; + phys_addr_t off; + int npages; + + off = phys & (PAGE_SIZE - 1); + npages = (off + size - 1) / PAGE_SIZE + 1; + phys &= ~(PAGE_SIZE - 1); + + virt = ofmem_claim_io(-1, npages * PAGE_SIZE, PAGE_SIZE); + + mode = ofmem_arch_io_translation_mode(off); + + ofmem_map_page_range(phys, virt, npages * PAGE_SIZE, mode); + ofmem_arch_early_map_pages(phys, virt, npages * PAGE_SIZE, mode); + + return (virt + off); +} + /* virtual -> physical. */ phys_addr_t ofmem_translate( ucell virt, ucell *mode ) {

1 0

[commit] r1006 - in trunk/openbios-devel: arch/ppc/qemu arch/sparc32 arch/sparc64 drivers include/libopenbios
by repository service 02 Jan '11

02 Jan '11

Author: mcayland Date: Sun Jan 2 01:06:53 2011 New Revision: 1006 URL: http://tracker.coreboot.org/trac/openbios/changeset/1006 Log: Introduce ofmem_arch_io_translation_mode() to allow an OFMEM arch to specify different MMU modes for I/O memory mapped regions. Once this is in place, we can switch SPARC32's map_pages() over to use the MMU mode directly to bring it in line with the existing OFMEM API. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Tested-by: Blue Swirl <blauwirbel(a)gmail.com> Reviewed-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c trunk/openbios-devel/arch/sparc32/lib.c trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c trunk/openbios-devel/drivers/iommu.c trunk/openbios-devel/include/libopenbios/ofmem.h Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sun Jan 2 01:06:47 2011 (r1005) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sun Jan 2 01:06:53 2011 (r1006) @@ -239,6 +239,10 @@ return 0x6a; /* WIm GxPp, I/O */ } +ucell ofmem_arch_io_translation_mode(phys_addr_t phys) +{ + return 0x6a; /* WIm GxPp, I/O */ +} /************************************************************************/ /* page fault handler */ Modified: trunk/openbios-devel/arch/sparc32/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/lib.c Sun Jan 2 01:06:47 2011 (r1005) +++ trunk/openbios-devel/arch/sparc32/lib.c Sun Jan 2 01:06:53 2011 (r1006) @@ -208,15 +208,7 @@ pa = find_pte(virt, 1); pte = SRMMU_ET_PTE | ((phys & PAGE_MASK) >> 4); - - if (mode) { /* I/O */ - pte |= SRMMU_REF; - /* SRMMU cannot make Supervisor-only, but not exectutable */ - pte |= SRMMU_PRIV; - } else { /* memory */ - pte |= SRMMU_REF | SRMMU_CACHE; - pte |= SRMMU_PRIV; /* Supervisor only access */ - } + pte |= mode; *(uint32_t *)pa = pte; @@ -244,7 +236,7 @@ if (va == 0) return NULL; - map_pages(pa, va, npages * PAGE_SIZE, 1); + map_pages(pa, va, npages * PAGE_SIZE, ofmem_arch_io_translation_mode(pa)); return (void *)(va + off); } @@ -304,7 +296,7 @@ pa <<= 32; pa |= POP() & 0xffffffff; - map_pages(pa, va, size, 0); + map_pages(pa, va, size, ofmem_arch_default_translation_mode(pa)); DPRINTF("map-page: va 0x%lx pa 0x%llx size 0x%x\n", va, pa, size); } @@ -362,7 +354,7 @@ { uint64_t mpa = ((uint64_t)which_io << 32) | (uint64_t)pa; - map_pages(mpa, (unsigned long)va, size, 0); + map_pages(mpa, (unsigned long)va, size, ofmem_arch_default_translation_mode(mpa)); return va; } @@ -402,7 +394,7 @@ DPRINTF("obp_dumb_memalloc req null -> 0x%p\n", va); } - map_pages(totavail[0].num_bytes, (unsigned long)va, size, 0); + map_pages(totavail[0].num_bytes, (unsigned long)va, size, ofmem_arch_default_translation_mode(totavail[0].num_bytes)); update_memory_properties(); @@ -496,10 +488,10 @@ va = (unsigned long)&_start; size = (unsigned long)&_end - (unsigned long)&_start; pa = va2pa(va); - map_pages(pa, va, size, 0); + map_pages(pa, va, size, ofmem_arch_default_translation_mode(pa)); // 1:1 mapping for RAM - map_pages(0, 0, LOWMEMSZ, 0); + map_pages(0, 0, LOWMEMSZ, ofmem_arch_default_translation_mode(0)); /* * Flush cache Modified: trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c Sun Jan 2 01:06:47 2011 (r1005) +++ trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c Sun Jan 2 01:06:53 2011 (r1006) @@ -123,6 +123,11 @@ return SRMMU_REF | SRMMU_CACHE | SRMMU_PRIV; } +ucell ofmem_arch_io_translation_mode( phys_addr_t phys ) +{ + return SRMMU_REF | SRMMU_PRIV; +} + /************************************************************************/ /* init / cleanup */ /************************************************************************/ Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Sun Jan 2 01:06:47 2011 (r1005) +++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Sun Jan 2 01:06:53 2011 (r1006) @@ -120,8 +120,11 @@ return SPITFIRE_TTE_CP | SPITFIRE_TTE_CV | SPITFIRE_TTE_WRITABLE; } - - +ucell ofmem_arch_io_translation_mode( phys_addr_t phys ) +{ + /* Writable, not privileged and not locked */ + return SPITFIRE_TTE_CV | SPITFIRE_TTE_WRITABLE; +} /************************************************************************/ /* init / cleanup */ Modified: trunk/openbios-devel/drivers/iommu.c ============================================================================== --- trunk/openbios-devel/drivers/iommu.c Sun Jan 2 01:06:47 2011 (r1005) +++ trunk/openbios-devel/drivers/iommu.c Sun Jan 2 01:06:53 2011 (r1006) @@ -68,7 +68,7 @@ */ mva = (unsigned int) va; mpa = (unsigned int) pa; - map_pages(mpa, mva, npages * PAGE_SIZE, 1); + map_pages(mpa, mva, npages * PAGE_SIZE, ofmem_arch_io_translation_mode(mpa)); /* * Map into IOMMU page table. Modified: trunk/openbios-devel/include/libopenbios/ofmem.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/ofmem.h Sun Jan 2 01:06:47 2011 (r1005) +++ trunk/openbios-devel/include/libopenbios/ofmem.h Sun Jan 2 01:06:53 2011 (r1006) @@ -69,6 +69,7 @@ extern int ofmem_arch_get_translation_entry_size(void); extern void ofmem_arch_create_translation_entry(ucell *transentry, translation_t *t); extern ucell ofmem_arch_default_translation_mode( phys_addr_t phys ); +extern ucell ofmem_arch_io_translation_mode( phys_addr_t phys ); extern void ofmem_arch_early_map_pages(phys_addr_t phys, ucell virt, ucell size, ucell mode); extern void ofmem_arch_unmap_pages(ucell virt, ucell size);

1 0

[commit] r1005 - in trunk/openbios-devel: arch/sparc32 drivers include/libopenbios
by repository service 02 Jan '11

02 Jan '11

Author: mcayland Date: Sun Jan 2 01:06:47 2011 New Revision: 1005 URL: http://tracker.coreboot.org/trac/openbios/changeset/1005 Log: Remove the existing map_page() function and instead install a transitional API using map_pages() which is almost identical to the OFMEM API. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Tested-by: Blue Swirl <blauwirbel(a)gmail.com> Reviewed-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc32/lib.c trunk/openbios-devel/drivers/iommu.c trunk/openbios-devel/include/libopenbios/ofmem.h Modified: trunk/openbios-devel/arch/sparc32/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/lib.c Sun Jan 2 01:06:40 2011 (r1004) +++ trunk/openbios-devel/arch/sparc32/lib.c Sun Jan 2 01:06:47 2011 (r1005) @@ -190,49 +190,41 @@ return pa2va(pa); } -/* - * Create a memory mapping from va to epa. - */ -int -map_page(unsigned long va, uint64_t epa, int type) +void +map_pages(phys_addr_t phys, unsigned long virt, + unsigned long size, unsigned long mode) { + unsigned long npages, off; uint32_t pte; unsigned long pa; - pa = find_pte(va, 1); + DPRINTF("map_pages: va 0x%lx, pa 0x%llx, size 0x%lx\n", virt, phys, size); - pte = SRMMU_ET_PTE | ((epa & PAGE_MASK) >> 4); - if (type) { /* I/O */ - pte |= SRMMU_REF; - /* SRMMU cannot make Supervisor-only, but not exectutable */ - pte |= SRMMU_PRIV; - } else { /* memory */ - pte |= SRMMU_REF | SRMMU_CACHE; - pte |= SRMMU_PRIV; /* Supervisor only access */ - } - *(uint32_t *)pa = pte; - DPRINTF("map_page: va 0x%lx pa 0x%llx pte 0x%x\n", va, epa, pte); + off = phys & (PAGE_SIZE - 1); + npages = (off + (size - 1) + (PAGE_SIZE - 1)) / PAGE_SIZE; + phys &= ~(uint64_t)(PAGE_SIZE - 1); - return 0; -} + while (npages-- != 0) { + pa = find_pte(virt, 1); -static void map_pages(unsigned long va, uint64_t pa, int type, - unsigned long size) -{ - unsigned long npages, off; + pte = SRMMU_ET_PTE | ((phys & PAGE_MASK) >> 4); - DPRINTF("map_pages: va 0x%lx, pa 0x%llx, size 0x%lx\n", va, pa, size); + if (mode) { /* I/O */ + pte |= SRMMU_REF; + /* SRMMU cannot make Supervisor-only, but not exectutable */ + pte |= SRMMU_PRIV; + } else { /* memory */ + pte |= SRMMU_REF | SRMMU_CACHE; + pte |= SRMMU_PRIV; /* Supervisor only access */ + } - off = pa & (PAGE_SIZE - 1); - npages = (off + (size - 1) + (PAGE_SIZE - 1)) / PAGE_SIZE; - pa &= ~(uint64_t)(PAGE_SIZE - 1); + *(uint32_t *)pa = pte; - while (npages-- != 0) { - map_page(va, pa, type); - va += PAGE_SIZE; - pa += PAGE_SIZE; + virt += PAGE_SIZE; + phys += PAGE_SIZE; } } + /* * Create an I/O mapping to pa[size]. * Returns va of the mapping or 0 if unsuccessful. @@ -252,7 +244,7 @@ if (va == 0) return NULL; - map_pages(va, pa, 1, npages * PAGE_SIZE); + map_pages(pa, va, npages * PAGE_SIZE, 1); return (void *)(va + off); } @@ -312,7 +304,7 @@ pa <<= 32; pa |= POP() & 0xffffffff; - map_pages(va, pa, 0, size); + map_pages(pa, va, size, 0); DPRINTF("map-page: va 0x%lx pa 0x%llx size 0x%x\n", va, pa, size); } @@ -370,7 +362,7 @@ { uint64_t mpa = ((uint64_t)which_io << 32) | (uint64_t)pa; - map_pages((unsigned long)va, mpa, 0, size); + map_pages(mpa, (unsigned long)va, size, 0); return va; } @@ -410,7 +402,7 @@ DPRINTF("obp_dumb_memalloc req null -> 0x%p\n", va); } - map_pages((unsigned long)va, totavail[0].num_bytes, 0, size); + map_pages(totavail[0].num_bytes, (unsigned long)va, size, 0); update_memory_properties(); @@ -481,6 +473,7 @@ { unsigned int addr, i; unsigned long pa, va; + int size; mem_init(&cmem, (char *) &_vmem, (char *)&_evmem); mem_init(&cio, (char *)&_end, (char *)&_iomem); @@ -501,16 +494,12 @@ // text, rodata, data, and bss mapped to end of RAM va = (unsigned long)&_start; - for (; va < (unsigned long)&_end; va += PAGE_SIZE) { - pa = va2pa(va); - map_page(va, pa, 0); - } + size = (unsigned long)&_end - (unsigned long)&_start; + pa = va2pa(va); + map_pages(pa, va, size, 0); // 1:1 mapping for RAM - pa = va = 0; - for (; va < LOWMEMSZ; va += PAGE_SIZE, pa += PAGE_SIZE) { - map_page(va, pa, 0); - } + map_pages(0, 0, LOWMEMSZ, 0); /* * Flush cache Modified: trunk/openbios-devel/drivers/iommu.c ============================================================================== --- trunk/openbios-devel/drivers/iommu.c Sun Jan 2 01:06:40 2011 (r1004) +++ trunk/openbios-devel/drivers/iommu.c Sun Jan 2 01:06:47 2011 (r1005) @@ -68,11 +68,7 @@ */ mva = (unsigned int) va; mpa = (unsigned int) pa; - for (i = 0; i < npages; i++) { - map_page(mva, mpa, 1); - mva += PAGE_SIZE; - mpa += PAGE_SIZE; - } + map_pages(mpa, mva, npages * PAGE_SIZE, 1); /* * Map into IOMMU page table. Modified: trunk/openbios-devel/include/libopenbios/ofmem.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/ofmem.h Sun Jan 2 01:06:40 2011 (r1004) +++ trunk/openbios-devel/include/libopenbios/ofmem.h Sun Jan 2 01:06:47 2011 (r1005) @@ -129,7 +129,7 @@ void mem_init(struct mem *t, char *begin, char *limit); void *mem_alloc(struct mem *t, int size, int align); -int map_page(unsigned long va, uint64_t epa, int type); +void map_pages(phys_addr_t phys, unsigned long virt, unsigned long size, unsigned long mode); void *map_io(uint64_t pa, int size); #endif

1 0

[commit] r1004 - trunk/openbios-devel/arch/sparc32
by repository service 02 Jan '11

02 Jan '11

Author: mcayland Date: Sun Jan 2 01:06:40 2011 New Revision: 1004 URL: http://tracker.coreboot.org/trac/openbios/changeset/1004 Log: Switch SPARC32 over to use OFMEM's malloc()/free() internally rather than using it's own implementation. Also juggle the memory to take into account that the allocations are coming from OFMEM, and remove posix_memalign2() since it is no longer required. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Tested-by: Blue Swirl <blauwirbel(a)gmail.com> Reviewed-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc32/ldscript trunk/openbios-devel/arch/sparc32/lib.c trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c Modified: trunk/openbios-devel/arch/sparc32/ldscript ============================================================================== --- trunk/openbios-devel/arch/sparc32/ldscript Sun Jan 2 01:06:34 2011 (r1003) +++ trunk/openbios-devel/arch/sparc32/ldscript Sun Jan 2 01:06:40 2011 (r1004) @@ -12,8 +12,7 @@ /* 16KB stack */ STACK_SIZE = 16384; -/* 256k general alloc + 256k Forth dictionary + 16k Forth memory */ -VMEM_SIZE = (256 + 256 + 16) * 1024; +VMEM_SIZE = 128 * 1024; IOMEM_SIZE = 256 * 1024 + 768 * 1024; SECTIONS Modified: trunk/openbios-devel/arch/sparc32/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/lib.c Sun Jan 2 01:06:34 2011 (r1003) +++ trunk/openbios-devel/arch/sparc32/lib.c Sun Jan 2 01:06:40 2011 (r1004) @@ -75,18 +75,6 @@ struct linux_mlist_v0 *ptmap; struct linux_mlist_v0 *ptavail; -static struct { - char *next_malloc; - int left; - alloc_desc_t *mfree; /* list of free malloc blocks */ - - range_t *phys_range; - range_t *virt_range; - - translation_t *trans; /* this is really a translation_t */ -} ofmem; -#define ALLOC_BLOCK (64 * 1024) - /* Private functions for mapping between physical/virtual addresses */ phys_addr_t va2pa(unsigned long va) @@ -108,112 +96,22 @@ return pa; } -// XXX should be posix_memalign -static int -posix_memalign2(void **memptr, size_t alignment, size_t size) -{ - alloc_desc_t *d, **pp; - char *ret; - - if( !size ) - return -1; - - size = (size + (alignment - 1)) & ~(alignment - 1); - size += sizeof(alloc_desc_t); - - /* look in the freelist */ - for( pp=&ofmem.mfree; *pp && (**pp).size < size; pp = &(**pp).next ) - ; - - /* waste at most 4K by taking an entry from the freelist */ - if( *pp && (**pp).size < size + 0x1000 ) { - ret = (char*)*pp + sizeof(alloc_desc_t); - memset( ret, 0, (**pp).size - sizeof(alloc_desc_t) ); - *pp = (**pp).next; - *memptr = ret; - return 0; - } - - if( !ofmem.next_malloc || ofmem.left < size) { - unsigned long alloc_size = ALLOC_BLOCK; - if (size > ALLOC_BLOCK) - alloc_size = size; - // Recover possible leftover - if ((size_t)ofmem.left > sizeof(alloc_desc_t) + 4) { - alloc_desc_t *d_leftover; - - d_leftover = (alloc_desc_t*)ofmem.next_malloc; - d_leftover->size = ofmem.left - sizeof(alloc_desc_t); - free((void *)((unsigned long)d_leftover + - sizeof(alloc_desc_t))); - } - - ofmem.next_malloc = mem_alloc(&cmem, alloc_size, 8); - ofmem.left = alloc_size; - } - - if( ofmem.left < size) { - printk("out of malloc memory (%x)!\n", size ); - return -1; - } - d = (alloc_desc_t*) ofmem.next_malloc; - ofmem.next_malloc += size; - ofmem.left -= size; - - d->next = NULL; - d->size = size; - - ret = (char*)d + sizeof(alloc_desc_t); - memset( ret, 0, size - sizeof(alloc_desc_t) ); - *memptr = ret; - return 0; -} - -void *malloc(int size) -{ - int ret; - void *mem; - - ret = posix_memalign2(&mem, 8, size); - if (ret != 0) - return NULL; - return mem; -} - -void free(void *ptr) +void * +malloc(int size) { - alloc_desc_t **pp, *d; - - /* it is legal to free NULL pointers (size zero allocations) */ - if( !ptr ) - return; - - d = (alloc_desc_t*)((unsigned long)ptr - sizeof(alloc_desc_t)); - d->next = ofmem.mfree; - - /* insert in the (sorted) freelist */ - for( pp=&ofmem.mfree; *pp && (**pp).size < d->size ; pp = &(**pp).next ) - ; - d->next = *pp; - *pp = d; + return ofmem_malloc(size); } void * realloc( void *ptr, size_t size ) { - alloc_desc_t *d = (alloc_desc_t*)((unsigned long)ptr - sizeof(alloc_desc_t)); - char *p; + return ofmem_realloc(ptr, size); +} - if( !ptr ) - return malloc( size ); - if( !size ) { - free( ptr ); - return NULL; - } - p = malloc( size ); - memcpy( p, ptr, MIN(d->size - sizeof(alloc_desc_t),size) ); - free( ptr ); - return p; +void +free(void *ptr) +{ + ofmem_free(ptr); } /* Modified: trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c Sun Jan 2 01:06:34 2011 (r1003) +++ trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c Sun Jan 2 01:06:40 2011 (r1004) @@ -21,7 +21,7 @@ #define OF_MALLOC_BASE ((char*)OFMEM + ALIGN_SIZE(sizeof(ofmem_t), 8)) -#define MEMSIZE (256 * 1024) +#define MEMSIZE (512 * 1024) static union { char memory[MEMSIZE]; ofmem_t ofmem;

1 0

[commit] r1003 - trunk/openbios-devel/arch/sparc32
by repository service 02 Jan '11

02 Jan '11

Author: mcayland Date: Sun Jan 2 01:06:34 2011 New Revision: 1003 URL: http://tracker.coreboot.org/trac/openbios/changeset/1003 Log: Add ofmem_init() function to openbios.c taking into account that unlike SPARC64, OFMEM needs to be setup *before* the MMU so that the page table allocation routines can use it. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Tested-by: Blue Swirl <blauwirbel(a)gmail.com> Reviewed-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc32/openbios.c Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Sun Jan 2 01:06:12 2011 (r1002) +++ trunk/openbios-devel/arch/sparc32/openbios.c Sun Jan 2 01:06:34 2011 (r1003) @@ -25,6 +25,7 @@ #include "packages/video.h" #define NO_QEMU_PROTOS #include "arch/common/fw_cfg.h" +#include "libopenbios/ofmem.h" #define MEMORY_SIZE (16*1024) /* 16K ram for hosted system */ #define DICTIONARY_SIZE (256*1024) /* 256K for the dictionary */ @@ -946,6 +947,9 @@ if (!hwdef) for(;;); // Internal inconsistency, hang + /* Make sure we setup OFMEM before the MMU as we need malloc() to setup page tables */ + ofmem_init(); + #ifdef CONFIG_DRIVER_SBUS init_mmu_swift(); #endif

1 0

[commit] r1002 - in trunk/openbios-devel: arch/sparc32 drivers include/libc
by repository service 02 Jan '11

02 Jan '11

Author: mcayland Date: Sun Jan 2 01:06:12 2011 New Revision: 1002 URL: http://tracker.coreboot.org/trac/openbios/changeset/1002 Log: Switch IOMMU posix_memalign() calls over to ofmem_posix_memalign(), and then remove the private SPARC32 posix_memalign() implementation since it is no longer required. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Tested-by: Blue Swirl <blauwirbel(a)gmail.com> Reviewed-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc32/lib.c trunk/openbios-devel/drivers/iommu.c trunk/openbios-devel/include/libc/stdlib.h Modified: trunk/openbios-devel/arch/sparc32/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/lib.c Sun Jan 2 01:06:03 2011 (r1001) +++ trunk/openbios-devel/arch/sparc32/lib.c Sun Jan 2 01:06:12 2011 (r1002) @@ -216,21 +216,6 @@ return p; } -// XXX should be removed -int -posix_memalign(void **memptr, size_t alignment, size_t size) -{ - void *block; - - block = mem_alloc(&cmem, size, alignment); - - if (!block) - return -1; - - *memptr = block; - return 0; -} - /* * Allocate memory. This is reusable. */ Modified: trunk/openbios-devel/drivers/iommu.c ============================================================================== --- trunk/openbios-devel/drivers/iommu.c Sun Jan 2 01:06:03 2011 (r1001) +++ trunk/openbios-devel/drivers/iommu.c Sun Jan 2 01:06:12 2011 (r1002) @@ -53,7 +53,7 @@ int ret; npages = (size + (PAGE_SIZE-1)) / PAGE_SIZE; - ret = posix_memalign(&va, npages * PAGE_SIZE, PAGE_SIZE); + ret = ofmem_posix_memalign(&va, npages * PAGE_SIZE, PAGE_SIZE); if (ret != 0) return NULL; @@ -132,7 +132,7 @@ /* Allocate IOMMU page table */ /* Tremendous alignment causes great waste... */ ptsize = (vasize / PAGE_SIZE) * sizeof(int); - ret = posix_memalign((void *)&ptab, ptsize, ptsize); + ret = ofmem_posix_memalign((void *)&ptab, ptsize, ptsize); if (ret != 0) { DPRINTF("Cannot allocate IOMMU table [0x%x]\n", ptsize); for (;;) { } Modified: trunk/openbios-devel/include/libc/stdlib.h ============================================================================== --- trunk/openbios-devel/include/libc/stdlib.h Sun Jan 2 01:06:03 2011 (r1001) +++ trunk/openbios-devel/include/libc/stdlib.h Sun Jan 2 01:06:12 2011 (r1002) @@ -19,7 +19,6 @@ extern void *malloc( int size ); extern void free( void *ptr ); extern void *realloc( void *ptr, size_t size ); -extern int posix_memalign(void **memptr, size_t alignment, size_t size); /* should perhaps go somewhere else... */ extern void qsort( void *base, size_t nmemb, size_t size, int (*compar)(const void*, const void*));

1 0

[commit] r1001 - trunk/openbios-devel/arch/sparc32
by repository service 02 Jan '11

02 Jan '11

Author: mcayland Date: Sun Jan 2 01:06:03 2011 New Revision: 1001 URL: http://tracker.coreboot.org/trac/openbios/changeset/1001 Log: Switch SPARC32 page tables over to use OFMEM's ofmem_posix_memalign() rather than its internal posix_memalign() function. This requires a corresponding increase in the memory allocated to OFMEM in order to store the page tables. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Tested-by: Blue Swirl <blauwirbel(a)gmail.com> Reviewed-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc32/lib.c trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c Modified: trunk/openbios-devel/arch/sparc32/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/lib.c Sun Jan 2 01:05:56 2011 (r1000) +++ trunk/openbios-devel/arch/sparc32/lib.c Sun Jan 2 01:06:03 2011 (r1001) @@ -273,7 +273,7 @@ pte = l1[(va >> SRMMU_PGDIR_SHIFT) & (SRMMU_PTRS_PER_PGD - 1)]; if ((pte & SRMMU_ET_MASK) == SRMMU_ET_INVALID) { if (alloc) { - ret = posix_memalign(&p, SRMMU_PTRS_PER_PMD * sizeof(int), + ret = ofmem_posix_memalign(&p, SRMMU_PTRS_PER_PMD * sizeof(int), SRMMU_PTRS_PER_PMD * sizeof(int)); if (ret != 0) return ret; @@ -290,7 +290,7 @@ pte = *(uint32_t *)pa2va(pa); if ((pte & SRMMU_ET_MASK) == SRMMU_ET_INVALID) { if (alloc) { - ret = posix_memalign(&p, SRMMU_PTRS_PER_PTE * sizeof(void *), + ret = ofmem_posix_memalign(&p, SRMMU_PTRS_PER_PTE * sizeof(void *), SRMMU_PTRS_PER_PTE * sizeof(void *)); if (ret != 0) return ret; @@ -602,9 +602,9 @@ mem_init(&cmem, (char *) &_vmem, (char *)&_evmem); mem_init(&cio, (char *)&_end, (char *)&_iomem); - posix_memalign((void *)&context_table, NCTX_SWIFT * sizeof(int), + ofmem_posix_memalign((void *)&context_table, NCTX_SWIFT * sizeof(int), NCTX_SWIFT * sizeof(int)); - posix_memalign((void *)&l1, 256 * sizeof(int), 256 * sizeof(int)); + ofmem_posix_memalign((void *)&l1, 256 * sizeof(int), 256 * sizeof(int)); context_table[0] = (((unsigned long)va2pa((unsigned long)l1)) >> 4) | SRMMU_ET_PTD; Modified: trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c Sun Jan 2 01:05:56 2011 (r1000) +++ trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c Sun Jan 2 01:06:03 2011 (r1001) @@ -21,8 +21,7 @@ #define OF_MALLOC_BASE ((char*)OFMEM + ALIGN_SIZE(sizeof(ofmem_t), 8)) -/* Temporarily very small */ -#define MEMSIZE (1 * 1024) +#define MEMSIZE (256 * 1024) static union { char memory[MEMSIZE]; ofmem_t ofmem;

1 0

[commit] r1000 - trunk/openbios-devel/arch/sparc32
by repository service 02 Jan '11

02 Jan '11

Author: mcayland Date: Sun Jan 2 01:05:56 2011 New Revision: 1000 URL: http://tracker.coreboot.org/trac/openbios/changeset/1000 Log: Alter the SPARC32 entry.S file to allow extra space for the page tables to handle OpenBIOS images up to 2MB. Currently the page tables only allow enough space for a 1.5MB image; however during testing/development it was useful to temporarily allow larger images for debugging. Note that if larger ROM sizes are required for testing, it is necessary to patch qemu to raise the hardcoded limit there too. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Tested-by: Blue Swirl <blauwirbel(a)gmail.com> Reviewed-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc32/entry.S Modified: trunk/openbios-devel/arch/sparc32/entry.S ============================================================================== --- trunk/openbios-devel/arch/sparc32/entry.S Sun Jan 2 01:05:51 2011 (r999) +++ trunk/openbios-devel/arch/sparc32/entry.S Sun Jan 2 01:05:56 2011 (r1000) @@ -38,15 +38,15 @@ * * Top +-------------------------+ * | SMP CPU table | - * | s + 0xf00 ... 0xf0f | - * | s + 0xf0c valid | - * | s + 0xf08 entry | - * | s + 0xf04 ctxtbl | - * | s + 0xf00 ctx | + * | s + 0x1f00 ... 0x1f0f | + * | s + 0x1f0c valid | + * | s + 0x1f08 entry | + * | s + 0x1f04 ctxtbl | + * | s + 0x1f00 ctx | * +-------------------------+ * | Bootstrap | - * | MMU L3 tables 5 * 0x100 | - * | s + 0xa00 ... 0xeff | + * | MMU L3 tables 8 * 0x100 | + * | s + 0xa00 ... 0x11ff | * +-------------------------+ * | Bootstrap | * | MMU L2 tables 2 * 0x100 | @@ -123,11 +123,12 @@ ! Start of private memory in %g6 - set 0x1000, %g3 + set 0x2000, %g3 sub %g1, %g3, %g6 ! Calculate SMP table location - add %g6, 0xf0c, %g2 ! valid? + set 0x1f0c, %g2 + add %g6, %g2, %g2 ! valid? lda [%g2] ASI_M_BYPASS, %g7 sta %g0, [%g2] ASI_M_BYPASS @@ -168,17 +169,20 @@ load_ctx: ! SMP init, jump to user specified address - add %g6, 0xf04, %g5 ! ctxtbl + set 0x1f04, %g5 + add %g6, %g5, %g5 ! ctxtbl lda [%g5] ASI_M_BYPASS, %g2 sta %g0, [%g5] ASI_M_BYPASS set AC_M_CTPR, %g1 sta %g2, [%g1] ASI_M_MMUREGS ! set ctx table ptr - add %g6, 0xf00, %g5 ! ctx + set 0x1f00, %g5 + add %g6, %g5, %g5 ! ctx lda [%g5] ASI_M_BYPASS, %g2 sta %g0, [%g5] ASI_M_BYPASS set AC_M_CXR, %g1 sta %g2, [%g1] ASI_M_MMUREGS ! set context - add %g6, 0xf08, %g5 ! entry + set 0x1f08, %g5 + add %g6, %g5, %g5 ! entry lda [%g5] ASI_M_BYPASS, %g2 sta %g0, [%g5] ASI_M_BYPASS set 1, %g1 @@ -217,7 +221,7 @@ /* Create temporary page tables and map the ROM area to end of RAM. This will be done properly in iommu.c later. */ ! Calculate start of page tables etc. to %g6 - set 0x1000, %g4 + set 0x2000, %g4 sub %g1, %g4, %g6 ! start of private memory mov %g6, %g2 ! ctx table at s+0x0 @@ -273,7 +277,22 @@ srl %g3, 0x4, %g3 or %g3, 0x1, %g3 sta %g3, [%g2] ASI_M_BYPASS - add %g2, 0xa00-0x9e0, %g2 ! s+0xa00 + add %g2, 4, %g2 ! s+0x9e4 + add %g2, 0xf00 - 0x9e4, %g3 ! 6th l3 table for rom at s+0xf00 + srl %g3, 0x4, %g3 + or %g3, 0x1, %g3 + sta %g3, [%g2] ASI_M_BYPASS + add %g2, 4, %g2 ! s+0x9e8 + add %g2, 0x1000 - 0x9e8, %g3 ! 7th l3 table for rom at s+0x1000 + srl %g3, 0x4, %g3 + or %g3, 0x1, %g3 + sta %g3, [%g2] ASI_M_BYPASS + add %g2, 4, %g2 ! s+0x9ec + add %g2, 0x1100 - 0x9ec, %g3 ! 8th l3 table for rom at s+0x1100 + srl %g3, 0x4, %g3 + or %g3, 0x1, %g3 + sta %g3, [%g2] ASI_M_BYPASS + add %g2, 0xa00-0x9ec, %g2 ! s+0xa00 /* Use end of ram for code, rodata, data, and bss sections. SunOS wants to write to trap table... */ @@ -282,6 +301,7 @@ sub %g6, %g4, %g6 sub %g1, %g6, %g3 set 0x1000, %g5 + sub %g3, %g5, %g3 sub %g3, %g5, %g3 ! start of ROM copy mov %g3, %g7 ! save in %g7 srl %g6, 12, %g6 ! # of all pages @@ -311,7 +331,7 @@ bl 1b add %g4, 0x4, %g4 - set 0x1000, %g3 + set 0x2000, %g3 sub %g6, %g3, %g7 ! ctx table at s+0x0 set AC_M_CTPR, %g2 srl %g7, 4, %g7 @@ -360,7 +380,7 @@ set _start, %o2 sub %o0, %o2, %o0 sub %g6, %o0, %o0 - set 0x1000, %o1 + set 0x2000, %o1 sub %o0, %o1, %o0 ! start of ROM copy sub %o2, %o0, %o0 ! start of ROM copy set va_shift, %g1

1 0

[commit] r999 - trunk/openbios-devel/arch/sparc32
by repository service 02 Jan '11

02 Jan '11

Author: mcayland Date: Sun Jan 2 01:05:51 2011 New Revision: 999 URL: http://tracker.coreboot.org/trac/openbios/changeset/999 Log: Reduce memory of the Forth machine to 16k. Since this memory is only being used by alloc-mem and free-mem then the majority of memory allocations will not actually be taken from this pool but from the C malloc()/free() implementations instead. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Tested-by: Blue Swirl <blauwirbel(a)gmail.com> Reviewed-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc32/ldscript trunk/openbios-devel/arch/sparc32/openbios.c Modified: trunk/openbios-devel/arch/sparc32/ldscript ============================================================================== --- trunk/openbios-devel/arch/sparc32/ldscript Sun Jan 2 01:05:44 2011 (r998) +++ trunk/openbios-devel/arch/sparc32/ldscript Sun Jan 2 01:05:51 2011 (r999) @@ -12,8 +12,8 @@ /* 16KB stack */ STACK_SIZE = 16384; -/* 256k general alloc + 256k Forth dictionary + 128k Forth memory */ -VMEM_SIZE = (256 + 256 + 128) * 1024; +/* 256k general alloc + 256k Forth dictionary + 16k Forth memory */ +VMEM_SIZE = (256 + 256 + 16) * 1024; IOMEM_SIZE = 256 * 1024 + 768 * 1024; SECTIONS Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Sun Jan 2 01:05:44 2011 (r998) +++ trunk/openbios-devel/arch/sparc32/openbios.c Sun Jan 2 01:05:51 2011 (r999) @@ -26,7 +26,7 @@ #define NO_QEMU_PROTOS #include "arch/common/fw_cfg.h" -#define MEMORY_SIZE (128*1024) /* 16K ram for hosted system */ +#define MEMORY_SIZE (16*1024) /* 16K ram for hosted system */ #define DICTIONARY_SIZE (256*1024) /* 256K for the dictionary */ #define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" #define FW_CFG_SUN4M_DEPTH (FW_CFG_ARCH_LOCAL + 0x00)

1 0

[commit] r998 - in trunk/openbios-devel: arch/sparc32 config/examples
by repository service 02 Jan '11

02 Jan '11

Author: mcayland Date: Sun Jan 2 01:05:44 2011 New Revision: 998 URL: http://tracker.coreboot.org/trac/openbios/changeset/998 Log: Change the SPARC32 build system so that OFMEM is now included within SPARC32 builds. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Tested-by: Blue Swirl <blauwirbel(a)gmail.com> Reviewed-by: Blue Swirl <blauwirbel(a)gmail.com> Added: trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c Modified: trunk/openbios-devel/arch/sparc32/build.xml trunk/openbios-devel/arch/sparc32/lib.c trunk/openbios-devel/config/examples/sparc32_config.xml Modified: trunk/openbios-devel/arch/sparc32/build.xml ============================================================================== --- trunk/openbios-devel/arch/sparc32/build.xml Thu Dec 30 23:02:09 2010 (r997) +++ trunk/openbios-devel/arch/sparc32/build.xml Sun Jan 2 01:05:44 2011 (r998) @@ -15,6 +15,7 @@ <object source="udiv.S"/> <object source="linux_load.c"/> <object source="sys_info.c"/> + <object source="ofmem_sparc32.c"/> <object source="romvec.c"/> <object source="call-romvec.S"/> <object source="entry.S"/> Modified: trunk/openbios-devel/arch/sparc32/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/lib.c Thu Dec 30 23:02:09 2010 (r997) +++ trunk/openbios-devel/arch/sparc32/lib.c Sun Jan 2 01:05:44 2011 (r998) @@ -497,6 +497,16 @@ DPRINTF("obp_dumb_munmap: virta 0x%x, sz %d\n", (unsigned int)va, size); } +void ofmem_arch_unmap_pages(ucell virt, ucell size) +{ + /* Currently do nothing */ +} + +void ofmem_arch_early_map_pages(phys_addr_t phys, ucell virt, ucell size, ucell mode) +{ + /* Currently do nothing */ +} + char *obp_dumb_memalloc(char *va, unsigned int size) { size = (size + 7) & ~7; Added: trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c Sun Jan 2 01:05:44 2011 (r998) @@ -0,0 +1,135 @@ +/* + * <ofmem_sparc32.c> + * + * OF Memory manager + * + * Copyright (C) 1999-2004 Samuel Rydh (samuel(a)ibrium.se) + * Copyright (C) 2004 Stefan Reinauer + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation + * + */ + +#include "config.h" +#include "libopenbios/bindings.h" +#include "libc/string.h" +#include "libopenbios/ofmem.h" +#include "asm/asi.h" +#include "pgtsrmmu.h" + +#define OF_MALLOC_BASE ((char*)OFMEM + ALIGN_SIZE(sizeof(ofmem_t), 8)) + +/* Temporarily very small */ +#define MEMSIZE (1 * 1024) +static union { + char memory[MEMSIZE]; + ofmem_t ofmem; +} s_ofmem_data; + +#define OFMEM (&s_ofmem_data.ofmem) +#define TOP_OF_RAM (s_ofmem_data.memory + MEMSIZE) + +translation_t **g_ofmem_translations = &s_ofmem_data.ofmem.trans; + +extern uint32_t qemu_mem_size; + +static inline size_t ALIGN_SIZE(size_t x, size_t a) +{ + return (x + a - 1) & ~(a-1); +} + +static ucell get_heap_top( void ) +{ + return (ucell)TOP_OF_RAM; +} + +ofmem_t* ofmem_arch_get_private(void) +{ + return OFMEM; +} + +void* ofmem_arch_get_malloc_base(void) +{ + return OF_MALLOC_BASE; +} + +ucell ofmem_arch_get_heap_top(void) +{ + return get_heap_top(); +} + +ucell ofmem_arch_get_virt_top(void) +{ + return (ucell)TOP_OF_RAM; +} + +phys_addr_t ofmem_arch_get_phys_top(void) +{ + ofmem_t *ofmem = ofmem_arch_get_private(); + + return (uintptr_t)ofmem->ramsize - 0x1000000; +} + +retain_t *ofmem_arch_get_retained(void) +{ + /* Not used */ + return 0; +} + +int ofmem_arch_get_physaddr_cellsize(void) +{ + return 2; +} + +int ofmem_arch_encode_physaddr(ucell *p, phys_addr_t value) +{ + int n = 0; + + p[n++] = value >> 32; + p[n++] = value; + + return n; +} + +int ofmem_arch_get_translation_entry_size(void) +{ + /* Return size of a single MMU package translation property entry in cells */ + return 3; +} + +void ofmem_arch_create_translation_entry(ucell *transentry, translation_t *t) +{ + /* Generate translation property entry for SPARC. While there is no + formal documentation for this, both Linux kernel and OpenSolaris sources + expect a translation property entry to have the following layout: + + virtual address + length + mode + */ + + transentry[0] = t->virt; + transentry[1] = t->size; + transentry[2] = t->mode; +} + +/************************************************************************/ +/* misc */ +/************************************************************************/ + +ucell ofmem_arch_default_translation_mode( phys_addr_t phys ) +{ + return SRMMU_REF | SRMMU_CACHE | SRMMU_PRIV; +} + +/************************************************************************/ +/* init / cleanup */ +/************************************************************************/ + +void ofmem_init( void ) +{ + memset(&s_ofmem_data, 0, sizeof(s_ofmem_data)); + s_ofmem_data.ofmem.ramsize = qemu_mem_size; +} Modified: trunk/openbios-devel/config/examples/sparc32_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/sparc32_config.xml Thu Dec 30 23:02:09 2010 (r997) +++ trunk/openbios-devel/config/examples/sparc32_config.xml Sun Jan 2 01:05:44 2011 (r998) @@ -26,6 +26,8 @@ <option name="CONFIG_DEBLOCKER" type="boolean" value="true"/> <option name="CONFIG_FONT_8X8" type="boolean" value="true"/> <option name="CONFIG_FONT_8X16" type="boolean" value="false"/> + <option name="CONFIG_OFMEM" type="boolean" value="true"/> + <option name="CONFIG_OFMEM_MALLOC_ALIGN" type="integer" value="8"/> <option name="CONFIG_LOADER_AOUT" type="boolean" value="true"/> <option name="CONFIG_LOADER_BOOTINFO" type="boolean" value="false"/> <option name="CONFIG_LOADER_ELF" type="boolean" value="true"/>

1 0

Re: [OpenBIOS] [PATCH 3/6] Introduce va2pa() and pa2va() functions for PPC for subsequent use by OFMEM.
by Andreas Färber 01 Jan '11

01 Jan '11

Mark, Am 29.12.2010 um 12:07 schrieb Mark Cave-Ayland: > Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> This does not really address my comments... > --- > openbios-devel/arch/ppc/qemu/ofmem.c | 21 +++++++++++++++++++++ > 1 files changed, 21 insertions(+), 0 deletions(-) > > diff --git a/openbios-devel/arch/ppc/qemu/ofmem.c b/openbios-devel/ > arch/ppc/qemu/ofmem.c > index c21a112..44b5ef4 100644 > --- a/openbios-devel/arch/ppc/qemu/ofmem.c > +++ b/openbios-devel/arch/ppc/qemu/ofmem.c > @@ -180,6 +180,27 @@ void ofmem_arch_create_translation_entry(ucell > *transentry, translation_t *t) > /* OF private allocations */ > / > ************************************************************************/ > > +/* Private functions for mapping between physical/virtual addresses > */ > +inline phys_addr_t > +va2pa(unsigned long va) > +{ > + if (va >= OF_CODE_START && va < OF_CODE_START + OF_CODE_SIZE) { The latter will overflow on 32-bit ppc, and (va < 0) == 0 so that branch would never be taken. Is there no compiler warning? > + return (phys_addr_t)get_rom_base() - OF_CODE_START + va; Again, what's the reason for duplicating this calculation? > + } else { > + return (phys_addr_t)va; > + } > +} What about the following trivial implementation instead? phys_addr_t va2pa(unsigned long va) { ucell mode; return ea_to_phys(va, &mode); // calls ofmem_translate() internally for the 'else' case } > + > +inline unsigned long > +pa2va(phys_addr_t pa) > +{ > + if ((pa - get_rom_base() + OF_CODE_START >= OF_CODE_START) && > + (pa - get_rom_base() + OF_CODE_START < OF_CODE_START + > OF_CODE_SIZE)) > + return (unsigned long)pa - get_rom_base() + OF_CODE_START; > + else > + return (unsigned long)pa; > +} Trailing whitespace? Missing braces for QEMU style. BR, Andreas > + > void * > malloc(int size) > { > -- > 1.7.2.3 > > > -- > OpenBIOS http://openbios.org/ > Mailinglist: http://lists.openbios.org/mailman/listinfo > Free your System - May the Forth be with you

2 7

[PATCH 13/13] Fix the FMT_cell and FMT_ucell definitions for SPARC32.
by Mark Cave-Ayland 31 Dec '10

31 Dec '10

This is required to enable a build with CONFIG_DEBUG_OFMEM set to true to complete successfully. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> --- openbios-devel/include/arch/sparc32/types.h | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/openbios-devel/include/arch/sparc32/types.h b/openbios-devel/include/arch/sparc32/types.h index 444d648..b7c5fec 100644 --- a/openbios-devel/include/arch/sparc32/types.h +++ b/openbios-devel/include/arch/sparc32/types.h @@ -26,6 +26,8 @@ typedef int int32_t; typedef long long int64_t; typedef long intptr_t; +#define PRId32 "d" +#define PRIu32 "u" #define PRIx32 "x" #define PRIx64 "llx" #endif @@ -46,8 +48,8 @@ typedef uint32_t ucell; typedef long long dcell; typedef unsigned long long ducell; -#define FMT_cell "%ld" -#define FMT_ucell "%lu" +#define FMT_cell "%" PRId32 +#define FMT_ucell "%" PRIu32 #define FMT_ucellx "%08x" #define FMT_ucellX "%08X" -- 1.7.2.3

1 0

[PATCH 12/13] Switch remaining SPARC32 code over to OFMEM.
by Mark Cave-Ayland 31 Dec '10

31 Dec '10

This patch removes the SPARC32-specific map_pages() function from the IOMMU driver, plus switches obp_dumb_memalloc() over to use OFMEM. OFMEM property generation is enabled for the /memory and /virtual-memory nodes, and any remaining traces of the old memory variables are removed. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> --- openbios-devel/arch/sparc32/lib.c | 65 +++++++++------------------- openbios-devel/drivers/iommu.c | 2 +- openbios-devel/include/libopenbios/ofmem.h | 1 - 3 files changed, 21 insertions(+), 47 deletions(-) diff --git a/openbios-devel/arch/sparc32/lib.c b/openbios-devel/arch/sparc32/lib.c index 1de8868..72d3a87 100644 --- a/openbios-devel/arch/sparc32/lib.c +++ b/openbios-devel/arch/sparc32/lib.c @@ -53,8 +53,6 @@ struct mem { char *curp; }; -static struct mem cmem; /* Current memory, virtual */ -static struct mem cio; /* Current I/O space */ struct mem cdvmem; /* Current device virtual memory space */ unsigned int va_shift; @@ -190,7 +188,7 @@ find_pte(unsigned long va, int alloc) return pa2va(pa); } -void +static void map_pages(phys_addr_t phys, unsigned long virt, unsigned long size, unsigned long mode) { @@ -353,29 +351,19 @@ void ofmem_arch_early_map_pages(phys_addr_t phys, ucell virt, ucell size, ucell char *obp_dumb_memalloc(char *va, unsigned int size) { - size = (size + 7) & ~7; - // XXX should use normal memory alloc - totavail[0].num_bytes -= size; - DPRINTF("obp_dumb_memalloc va 0x%p size %x at 0x%x\n", va, size, - totavail[0].num_bytes); - - // If va is null, the allocator is supposed to pick a "suitable" address. - // (See OpenSolaric prom_alloc.c) There's not any real guidance as - // to what might be "suitable". So we mimic the behavior of a Sun boot - // ROM. - - if (va == NULL) { - va = (char *)(totmap[0].start_adr - size); - totmap[0].start_adr -= size; - totmap[0].num_bytes += size; - DPRINTF("obp_dumb_memalloc req null -> 0x%p\n", va); - } + phys_addr_t phys; + ucell virt; - map_pages(totavail[0].num_bytes, (unsigned long)va, size, ofmem_arch_default_translation_mode(totavail[0].num_bytes)); + /* Claim physical memory */ + phys = ofmem_claim_phys(-1, size, CONFIG_OFMEM_MALLOC_ALIGN); - update_memory_properties(); + /* Claim virtual memory */ + virt = ofmem_claim_virt(pointer2cell(va), size, 0); - return va; + /* Map the memory */ + ofmem_map(phys, virt, size, ofmem_arch_default_translation_mode(phys)); + + return cell2pointer(virt); } void obp_dumb_memfree(__attribute__((unused))char *va, @@ -387,6 +375,8 @@ void obp_dumb_memfree(__attribute__((unused))char *va, void ob_init_mmu(void) { + ucell *reg; + init_romvec_mem(); /* Find the phandles for the /memory and /virtual-memory nodes */ @@ -400,30 +390,18 @@ ob_init_mmu(void) POP(); s_phandle_mmu = POP(); - /* Setup /memory:reg (totphys) property */ - push_str("/memory"); - fword("find-device"); - PUSH(pointer2cell(mem_reg)); - PUSH(3 * sizeof(ucell)); - push_str("reg"); - PUSH_ph(s_phandle_memory); - fword("encode-property"); + ofmem_register(s_phandle_memory, s_phandle_mmu); - /* Setup /virtual-memory:avail (totmap) property */ - push_str("/virtual-memory"); - fword("find-device"); - PUSH(pointer2cell(virt_avail)); - PUSH(3 * sizeof(ucell)); - push_str("available"); - PUSH_ph(s_phandle_mmu); - fword("encode-property"); + /* Setup /memory:reg (totphys) property */ + reg = malloc(3 * sizeof(ucell)); + ofmem_arch_encode_physaddr(reg, 0); /* physical base */ + reg[2] = (ucell)ofmem_arch_get_phys_top(); /* size */ - /* Setup /memory:avail (totavail) property */ push_str("/memory"); fword("find-device"); - PUSH(pointer2cell(mem_avail)); + PUSH(pointer2cell(reg)); PUSH(3 * sizeof(ucell)); - push_str("available"); + push_str("reg"); PUSH_ph(s_phandle_memory); fword("encode-property"); @@ -444,9 +422,6 @@ init_mmu_swift(void) unsigned long pa, va; int size; - mem_init(&cmem, (char *) &_vmem, (char *)&_evmem); - mem_init(&cio, (char *)&_end, (char *)&_iomem); - ofmem_posix_memalign((void *)&context_table, NCTX_SWIFT * sizeof(int), NCTX_SWIFT * sizeof(int)); ofmem_posix_memalign((void *)&l1, 256 * sizeof(int), 256 * sizeof(int)); diff --git a/openbios-devel/drivers/iommu.c b/openbios-devel/drivers/iommu.c index 7d34f81..28f3b57 100644 --- a/openbios-devel/drivers/iommu.c +++ b/openbios-devel/drivers/iommu.c @@ -68,7 +68,7 @@ dvma_alloc(int size, unsigned int *pphys) */ mva = (unsigned int) va; mpa = (unsigned int) pa; - map_pages(mpa, mva, npages * PAGE_SIZE, ofmem_arch_io_translation_mode(mpa)); + ofmem_arch_early_map_pages(mpa, mva, npages * PAGE_SIZE, ofmem_arch_io_translation_mode(mpa)); /* * Map into IOMMU page table. diff --git a/openbios-devel/include/libopenbios/ofmem.h b/openbios-devel/include/libopenbios/ofmem.h index 1ba6c83..2269fd7 100644 --- a/openbios-devel/include/libopenbios/ofmem.h +++ b/openbios-devel/include/libopenbios/ofmem.h @@ -135,7 +135,6 @@ extern struct mem cdvmem; void mem_init(struct mem *t, char *begin, char *limit); void *mem_alloc(struct mem *t, int size, int align); -void map_pages(phys_addr_t phys, unsigned long virt, unsigned long size, unsigned long mode); #endif #ifdef PAGE_SHIFT -- 1.7.2.3

1 0

[PATCH 11/13] Switch all SPARC32 devices over from the private map_io() function over to OFMEM's ofmem_map_io() function.
by Mark Cave-Ayland 31 Dec '10

31 Dec '10

The old map_io() function can now be removed. Also fill in ofmem_arch_early_map_pages() on SPARC32 which is required for ofmem_map_io() to work correctly. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> --- openbios-devel/arch/sparc32/console.c | 4 ++-- openbios-devel/arch/sparc32/lib.c | 25 +------------------------ openbios-devel/drivers/escc.c | 4 ++-- openbios-devel/drivers/esp.c | 4 ++-- openbios-devel/drivers/fw_cfg.c | 2 +- openbios-devel/drivers/iommu.c | 2 +- openbios-devel/drivers/obio.c | 10 +++++----- openbios-devel/drivers/sbus.c | 2 +- openbios-devel/include/libopenbios/ofmem.h | 1 - 9 files changed, 15 insertions(+), 39 deletions(-) diff --git a/openbios-devel/arch/sparc32/console.c b/openbios-devel/arch/sparc32/console.c index 52e4827..2bcdf02 100644 --- a/openbios-devel/arch/sparc32/console.c +++ b/openbios-devel/arch/sparc32/console.c @@ -46,8 +46,8 @@ static void video_cls(void) void tcx_init(uint64_t base) { - vmem = map_io(base + VMEM_BASE, VMEM_SIZE); - dac = map_io(base + DAC_BASE, DAC_SIZE); + vmem = (unsigned char *)ofmem_map_io(base + VMEM_BASE, VMEM_SIZE); + dac = (uint32_t *)ofmem_map_io(base + DAC_BASE, DAC_SIZE); console_init(); } diff --git a/openbios-devel/arch/sparc32/lib.c b/openbios-devel/arch/sparc32/lib.c index 12c69d9..1de8868 100644 --- a/openbios-devel/arch/sparc32/lib.c +++ b/openbios-devel/arch/sparc32/lib.c @@ -218,29 +218,6 @@ map_pages(phys_addr_t phys, unsigned long virt, } /* - * Create an I/O mapping to pa[size]. - * Returns va of the mapping or 0 if unsuccessful. - */ -void * -map_io(uint64_t pa, int size) -{ - unsigned long va; - unsigned int npages; - unsigned int off; - - off = pa & (PAGE_SIZE - 1); - npages = (off + size - 1) / PAGE_SIZE + 1; - pa &= ~(PAGE_SIZE - 1); - - va = (unsigned long)mem_alloc(&cio, npages * PAGE_SIZE, PAGE_SIZE); - if (va == 0) - return NULL; - - map_pages(pa, va, npages * PAGE_SIZE, ofmem_arch_io_translation_mode(pa)); - return (void *)(va + off); -} - -/* * D5.3 pgmap@ ( va -- pte ) */ static void @@ -371,7 +348,7 @@ void ofmem_arch_unmap_pages(ucell virt, ucell size) void ofmem_arch_early_map_pages(phys_addr_t phys, ucell virt, ucell size, ucell mode) { - /* Currently do nothing */ + map_pages(phys, virt, size, mode); } char *obp_dumb_memalloc(char *va, unsigned int size) diff --git a/openbios-devel/drivers/escc.c b/openbios-devel/drivers/escc.c index e22d245..ef431b2 100644 --- a/openbios-devel/drivers/escc.c +++ b/openbios-devel/drivers/escc.c @@ -105,7 +105,7 @@ static void uart_init_line(volatile unsigned char *port, unsigned long baud) int uart_init(phys_addr_t port, unsigned long speed) { #ifdef CONFIG_DRIVER_ESCC_SUN - serial_dev = map_io(port & ~7ULL, ZS_REGS); + serial_dev = (unsigned char *)ofmem_map_io(port & ~7ULL, ZS_REGS); serial_dev += port & 7ULL; #else serial_dev = (unsigned char *)(uintptr_t)port; @@ -213,7 +213,7 @@ static volatile unsigned char *kbd_dev; void kbd_init(phys_addr_t base) { - kbd_dev = map_io(base, 2 * 4); + kbd_dev = (unsigned char *)ofmem_map_io(base, 2 * 4); kbd_dev += 4; } diff --git a/openbios-devel/drivers/esp.c b/openbios-devel/drivers/esp.c index 869421d..f268b6a 100644 --- a/openbios-devel/drivers/esp.c +++ b/openbios-devel/drivers/esp.c @@ -311,7 +311,7 @@ static int espdma_init(unsigned int slot, uint64_t base, unsigned long offset, struct esp_dma *espdma) { - espdma->regs = (void *)map_io(base + (uint64_t)offset, 0x10); + espdma->regs = (void *)ofmem_map_io(base + (uint64_t)offset, 0x10); if (espdma->regs == NULL) { DPRINTF("espdma_init: cannot map registers\n"); @@ -445,7 +445,7 @@ ob_esp_init(unsigned int slot, uint64_t base, unsigned long espoffset, return -1; } /* Get the IO region */ - esp->ll = (void *)map_io(base + (uint64_t)espoffset, + esp->ll = (void *)ofmem_map_io(base + (uint64_t)espoffset, sizeof(struct esp_regs)); if (esp->ll == NULL) { DPRINTF("Can't map ESP registers\n"); diff --git a/openbios-devel/drivers/fw_cfg.c b/openbios-devel/drivers/fw_cfg.c index 0da2e72..4027570 100644 --- a/openbios-devel/drivers/fw_cfg.c +++ b/openbios-devel/drivers/fw_cfg.c @@ -65,7 +65,7 @@ void fw_cfg_init(void) { #if defined(CONFIG_SPARC32) - fw_cfg_cmd = (void *)map_io(CONFIG_FW_CFG_ADDR, 2); + fw_cfg_cmd = (void *)ofmem_map_io(CONFIG_FW_CFG_ADDR, 2); fw_cfg_data = (uint8_t *)fw_cfg_cmd + 2; #elif defined(CONFIG_SPARC64) // Nothing for the port version diff --git a/openbios-devel/drivers/iommu.c b/openbios-devel/drivers/iommu.c index 6af5b33..7d34f81 100644 --- a/openbios-devel/drivers/iommu.c +++ b/openbios-devel/drivers/iommu.c @@ -103,7 +103,7 @@ iommu_init(struct iommu *t, uint64_t base) int ret; unsigned long vasize; - regs = map_io(base, IOMMU_REGS); + regs = (struct iommu_regs *)ofmem_map_io(base, IOMMU_REGS); if (regs == NULL) { DPRINTF("Cannot map IOMMU\n"); for (;;) { } diff --git a/openbios-devel/drivers/obio.c b/openbios-devel/drivers/obio.c index 38c5f8d..359c6c2 100644 --- a/openbios-devel/drivers/obio.c +++ b/openbios-devel/drivers/obio.c @@ -71,7 +71,7 @@ map_reg(uint64_t base, uint64_t offset, unsigned long size, int map, if (map) { unsigned long addr; - addr = (unsigned long)map_io(base + offset, size); + addr = (unsigned long)ofmem_map_io(base + offset, size); PUSH(addr); fword("encode-int"); @@ -251,7 +251,7 @@ ob_aux2_reset_init(uint64_t base, uint64_t offset, int intr) power_reg = (void *)ob_reg(base, offset, AUXIO2_REGS, 1); // Not in device tree - reset_reg = map_io(base + (uint64_t)SLAVIO_RESET, RESET_REGS); + reset_reg = (unsigned int *)ofmem_map_io(base + (uint64_t)SLAVIO_RESET, RESET_REGS); bind_func("sparc32-reset-all", sparc32_reset_all); push_str("' sparc32-reset-all to reset-all"); @@ -297,7 +297,7 @@ ob_counter_init(uint64_t base, unsigned long offset) fword("property"); - counter_regs = map_io(base + (uint64_t)offset, sizeof(*counter_regs)); + counter_regs = (struct sun4m_timer_regs *)ofmem_map_io(base + (uint64_t)offset, sizeof(*counter_regs)); counter_regs->cfg = 0xffffffff; counter_regs->l10_timer_limit = (((1000000/100) + 1) << 10); counter_regs->cpu_timers[0].l14_timer_limit = 0; @@ -352,7 +352,7 @@ ob_interrupt_init(uint64_t base, unsigned long offset) push_str("reg"); fword("property"); - intregs = map_io(base | (uint64_t)offset, sizeof(*intregs)); + intregs = (struct sun4m_intregs *)ofmem_map_io(base | (uint64_t)offset, sizeof(*intregs)); intregs->clear = ~SUN4M_INT_MASKALL; intregs->cpu_intregs[0].clear = ~0x17fff; @@ -403,7 +403,7 @@ static void ob_smp_init(unsigned long mem_size) { // See arch/sparc32/entry.S for memory layout - smp_header = (struct smp_cfg *)map_io((uint64_t)(mem_size - 0x100), + smp_header = (struct smp_cfg *)ofmem_map_io((uint64_t)(mem_size - 0x100), sizeof(struct smp_cfg)); } diff --git a/openbios-devel/drivers/sbus.c b/openbios-devel/drivers/sbus.c index cba1050..f4a6d66 100644 --- a/openbios-devel/drivers/sbus.c +++ b/openbios-devel/drivers/sbus.c @@ -49,7 +49,7 @@ ob_sbus_node_init(uint64_t base) push_str("reg"); fword("property"); - regs = map_io(base, SBUS_REGS); + regs = (void *)ofmem_map_io(base, SBUS_REGS); PUSH((unsigned long)regs); fword("encode-int"); push_str("address"); diff --git a/openbios-devel/include/libopenbios/ofmem.h b/openbios-devel/include/libopenbios/ofmem.h index 940f5cc..1ba6c83 100644 --- a/openbios-devel/include/libopenbios/ofmem.h +++ b/openbios-devel/include/libopenbios/ofmem.h @@ -136,7 +136,6 @@ extern struct mem cdvmem; void mem_init(struct mem *t, char *begin, char *limit); void *mem_alloc(struct mem *t, int size, int align); void map_pages(phys_addr_t phys, unsigned long virt, unsigned long size, unsigned long mode); -void *map_io(uint64_t pa, int size); #endif #ifdef PAGE_SHIFT -- 1.7.2.3

1 0

[PATCH 10/13] Implement ofmem_map_io() within OFMEM as a function to map I/O memory (similar to SPARC32's private map_io() function).
by Mark Cave-Ayland 31 Dec '10

31 Dec '10

As a consequence we need to maintain a separate I/O range within OFMEM, and add management functions similar to those that exist for the virtual and physical ranges. At the same time, we introduce a couple of new OFMEM arch functions called ofmem_arch_get_iomem_base() and ofmem_arch_get_iomem_top() to control the range of allocatable I/O memory which is again similar to the existing method used for the virtual and physical ranges. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> --- openbios-devel/arch/ppc/qemu/ofmem.c | 12 ++++++ openbios-devel/arch/sparc32/ofmem_sparc32.c | 10 +++++ openbios-devel/arch/sparc64/ofmem_sparc64.c | 12 ++++++ openbios-devel/include/libopenbios/ofmem.h | 9 ++++- openbios-devel/libopenbios/ofmem_common.c | 52 +++++++++++++++++++++++++++ 5 files changed, 93 insertions(+), 2 deletions(-) diff --git a/openbios-devel/arch/ppc/qemu/ofmem.c b/openbios-devel/arch/ppc/qemu/ofmem.c index 80fad75..4c6825e 100644 --- a/openbios-devel/arch/ppc/qemu/ofmem.c +++ b/openbios-devel/arch/ppc/qemu/ofmem.c @@ -132,6 +132,18 @@ void ofmem_arch_early_map_pages(phys_addr_t phys, ucell virt, ucell size, ucell /* none yet */ } +ucell ofmem_arch_get_iomem_base(void) +{ + /* Currently unused */ + return 0; +} + +ucell ofmem_arch_get_iomem_top(void) +{ + /* Currently unused */ + return 0; +} + retain_t *ofmem_arch_get_retained(void) { /* not implemented */ diff --git a/openbios-devel/arch/sparc32/ofmem_sparc32.c b/openbios-devel/arch/sparc32/ofmem_sparc32.c index 77112ec..6815349 100644 --- a/openbios-devel/arch/sparc32/ofmem_sparc32.c +++ b/openbios-devel/arch/sparc32/ofmem_sparc32.c @@ -71,6 +71,16 @@ phys_addr_t ofmem_arch_get_phys_top(void) return (uintptr_t)ofmem->ramsize - 0x1000000; } +ucell ofmem_arch_get_iomem_base(void) +{ + return pointer2cell(&_end); +} + +ucell ofmem_arch_get_iomem_top(void) +{ + return pointer2cell(&_iomem); +} + retain_t *ofmem_arch_get_retained(void) { /* Not used */ diff --git a/openbios-devel/arch/sparc64/ofmem_sparc64.c b/openbios-devel/arch/sparc64/ofmem_sparc64.c index 6a4fb5e..1655978 100644 --- a/openbios-devel/arch/sparc64/ofmem_sparc64.c +++ b/openbios-devel/arch/sparc64/ofmem_sparc64.c @@ -70,6 +70,18 @@ phys_addr_t ofmem_arch_get_phys_top(void) return ofmem->ramsize; } +ucell ofmem_arch_get_iomem_base(void) +{ + /* Currently unused */ + return 0; +} + +ucell ofmem_arch_get_iomem_top(void) +{ + /* Currently unused */ + return 0; +} + retain_t *ofmem_arch_get_retained(void) { /* Retained area is at the top of physical RAM */ diff --git a/openbios-devel/include/libopenbios/ofmem.h b/openbios-devel/include/libopenbios/ofmem.h index e350dec..940f5cc 100644 --- a/openbios-devel/include/libopenbios/ofmem.h +++ b/openbios-devel/include/libopenbios/ofmem.h @@ -46,6 +46,7 @@ typedef struct { range_t *phys_range; range_t *virt_range; + range_t *io_range; translation_t *trans; /* this is really a translation_t */ } ofmem_t; @@ -63,6 +64,8 @@ extern void* ofmem_arch_get_malloc_base(void); extern ucell ofmem_arch_get_heap_top(void); extern ucell ofmem_arch_get_virt_top(void); extern phys_addr_t ofmem_arch_get_phys_top(void); +extern ucell ofmem_arch_get_iomem_base(void); +extern ucell ofmem_arch_get_iomem_top(void); extern retain_t* ofmem_arch_get_retained(void); extern int ofmem_arch_get_physaddr_cellsize(void); extern int ofmem_arch_encode_physaddr(ucell *p, phys_addr_t value); @@ -104,25 +107,27 @@ extern void ofmem_register( phandle_t ph_memory, phandle_t ph_mmu ); extern ucell ofmem_claim( ucell addr, ucell size, ucell align ); extern phys_addr_t ofmem_claim_phys( phys_addr_t mphys, ucell size, ucell align ); extern ucell ofmem_claim_virt( ucell mvirt, ucell size, ucell align ); +extern ucell ofmem_claim_io( ucell virt, ucell size, ucell align ); extern phys_addr_t ofmem_retain( phys_addr_t phys, ucell size, ucell align ); extern int ofmem_map( phys_addr_t phys, ucell virt, ucell size, ucell mode ); extern int ofmem_unmap( ucell virt, ucell size ); +extern ucell ofmem_map_io( phys_addr_t phys, ucell size ); 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 phys_addr_t ofmem_translate( ucell virt, ucell *ret_mode ); -#ifdef CONFIG_PPC +/* Currently the same for all architectures */ #define PAGE_SHIFT 12 +#ifdef CONFIG_PPC unsigned long get_ram_top( void ); unsigned long get_ram_bottom( void ); #elif defined(CONFIG_SPARC32) -#define PAGE_SHIFT 12 /* arch/sparc32/lib.c */ struct mem; diff --git a/openbios-devel/libopenbios/ofmem_common.c b/openbios-devel/libopenbios/ofmem_common.c index e1accb2..7f6223b 100644 --- a/openbios-devel/libopenbios/ofmem_common.c +++ b/openbios-devel/libopenbios/ofmem_common.c @@ -551,6 +551,35 @@ ucell ofmem_claim_virt( ucell virt, ucell size, ucell align ) get_ram_size(), ofmem_arch_get_virt_top(), 1 ); } +static ucell ofmem_claim_io_( ucell virt, ucell size, ucell align, + ucell min, ucell max, int reverse ) +{ + ofmem_t *ofmem = ofmem_arch_get_private(); + if( !align ) { + if( !is_free( virt, size, ofmem->io_range ) ) { + OFMEM_TRACE("Non-free I/O memory claimed!\n"); + return -1; + } + add_entry( virt, size, &ofmem->io_range ); + return virt; + } + + virt = find_area( align, size, ofmem->io_range, min, max, reverse ); + if( virt == -1 ) { + printk("ofmem_claim_io - out of space (failed request for " FMT_ucellx " bytes)\n", size); + return -1; + } + add_entry( virt, size, &ofmem->io_range ); + return virt; +} + +ucell ofmem_claim_io( ucell virt, ucell size, ucell align ) +{ + /* Claim a section of memory from the I/O range */ + return ofmem_claim_io_( virt, size, align, + ofmem_arch_get_iomem_base(), ofmem_arch_get_iomem_top(), 0 ); +} + /* if align != 0, phys is ignored. Returns -1 on error */ phys_addr_t ofmem_retain( phys_addr_t phys, ucell size, ucell align ) { @@ -797,6 +826,29 @@ int ofmem_unmap( ucell virt, ucell size ) return 0; } +ucell ofmem_map_io( phys_addr_t phys, ucell size ) +{ + /* Claim virtual memory from the I/O range and map the page-aligned + physical address phys to it, returning the newly allocated + virtual address */ + ucell virt, mode; + phys_addr_t off; + int npages; + + off = phys & (PAGE_SIZE - 1); + npages = (off + size - 1) / PAGE_SIZE + 1; + phys &= ~(PAGE_SIZE - 1); + + virt = ofmem_claim_io(-1, npages * PAGE_SIZE, PAGE_SIZE); + + mode = ofmem_arch_io_translation_mode(off); + + ofmem_map_page_range(phys, virt, npages * PAGE_SIZE, mode); + ofmem_arch_early_map_pages(phys, virt, npages * PAGE_SIZE, mode); + + return (virt + off); +} + /* virtual -> physical. */ phys_addr_t ofmem_translate( ucell virt, ucell *mode ) { -- 1.7.2.3

1 0

[PATCH 09/13] Introduce ofmem_arch_io_translation_mode() to allow an OFMEM arch to specify different MMU modes for I/O memory mapped regions.
by Mark Cave-Ayland 31 Dec '10

31 Dec '10

Once this is in place, we can switch SPARC32's map_pages() over to use the MMU mode directly to bring it in line with the existing OFMEM API. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> --- openbios-devel/arch/ppc/qemu/ofmem.c | 4 ++++ openbios-devel/arch/sparc32/lib.c | 22 +++++++--------------- openbios-devel/arch/sparc32/ofmem_sparc32.c | 5 +++++ openbios-devel/arch/sparc64/ofmem_sparc64.c | 7 +++++-- openbios-devel/drivers/iommu.c | 2 +- openbios-devel/include/libopenbios/ofmem.h | 1 + 6 files changed, 23 insertions(+), 18 deletions(-) diff --git a/openbios-devel/arch/ppc/qemu/ofmem.c b/openbios-devel/arch/ppc/qemu/ofmem.c index c0143a4..80fad75 100644 --- a/openbios-devel/arch/ppc/qemu/ofmem.c +++ b/openbios-devel/arch/ppc/qemu/ofmem.c @@ -239,6 +239,10 @@ ucell ofmem_arch_default_translation_mode(phys_addr_t phys) return 0x6a; /* WIm GxPp, I/O */ } +ucell ofmem_arch_io_translation_mode(phys_addr_t phys) +{ + return 0x6a; /* WIm GxPp, I/O */ +} /************************************************************************/ /* page fault handler */ diff --git a/openbios-devel/arch/sparc32/lib.c b/openbios-devel/arch/sparc32/lib.c index b9f33a9..12c69d9 100644 --- a/openbios-devel/arch/sparc32/lib.c +++ b/openbios-devel/arch/sparc32/lib.c @@ -208,15 +208,7 @@ map_pages(phys_addr_t phys, unsigned long virt, pa = find_pte(virt, 1); pte = SRMMU_ET_PTE | ((phys & PAGE_MASK) >> 4); - - if (mode) { /* I/O */ - pte |= SRMMU_REF; - /* SRMMU cannot make Supervisor-only, but not exectutable */ - pte |= SRMMU_PRIV; - } else { /* memory */ - pte |= SRMMU_REF | SRMMU_CACHE; - pte |= SRMMU_PRIV; /* Supervisor only access */ - } + pte |= mode; *(uint32_t *)pa = pte; @@ -244,7 +236,7 @@ map_io(uint64_t pa, int size) if (va == 0) return NULL; - map_pages(pa, va, npages * PAGE_SIZE, 1); + map_pages(pa, va, npages * PAGE_SIZE, ofmem_arch_io_translation_mode(pa)); return (void *)(va + off); } @@ -304,7 +296,7 @@ ob_map_pages(void) pa <<= 32; pa |= POP() & 0xffffffff; - map_pages(pa, va, size, 0); + map_pages(pa, va, size, ofmem_arch_default_translation_mode(pa)); DPRINTF("map-page: va 0x%lx pa 0x%llx size 0x%x\n", va, pa, size); } @@ -362,7 +354,7 @@ char *obp_dumb_mmap(char *va, int which_io, unsigned int pa, { uint64_t mpa = ((uint64_t)which_io << 32) | (uint64_t)pa; - map_pages(mpa, (unsigned long)va, size, 0); + map_pages(mpa, (unsigned long)va, size, ofmem_arch_default_translation_mode(mpa)); return va; } @@ -402,7 +394,7 @@ char *obp_dumb_memalloc(char *va, unsigned int size) DPRINTF("obp_dumb_memalloc req null -> 0x%p\n", va); } - map_pages(totavail[0].num_bytes, (unsigned long)va, size, 0); + map_pages(totavail[0].num_bytes, (unsigned long)va, size, ofmem_arch_default_translation_mode(totavail[0].num_bytes)); update_memory_properties(); @@ -496,10 +488,10 @@ init_mmu_swift(void) va = (unsigned long)&_start; size = (unsigned long)&_end - (unsigned long)&_start; pa = va2pa(va); - map_pages(pa, va, size, 0); + map_pages(pa, va, size, ofmem_arch_default_translation_mode(pa)); // 1:1 mapping for RAM - map_pages(0, 0, LOWMEMSZ, 0); + map_pages(0, 0, LOWMEMSZ, ofmem_arch_default_translation_mode(0)); /* * Flush cache diff --git a/openbios-devel/arch/sparc32/ofmem_sparc32.c b/openbios-devel/arch/sparc32/ofmem_sparc32.c index 74975e1..77112ec 100644 --- a/openbios-devel/arch/sparc32/ofmem_sparc32.c +++ b/openbios-devel/arch/sparc32/ofmem_sparc32.c @@ -123,6 +123,11 @@ ucell ofmem_arch_default_translation_mode( phys_addr_t phys ) return SRMMU_REF | SRMMU_CACHE | SRMMU_PRIV; } +ucell ofmem_arch_io_translation_mode( phys_addr_t phys ) +{ + return SRMMU_REF | SRMMU_PRIV; +} + /************************************************************************/ /* init / cleanup */ /************************************************************************/ diff --git a/openbios-devel/arch/sparc64/ofmem_sparc64.c b/openbios-devel/arch/sparc64/ofmem_sparc64.c index 0ec8632..6a4fb5e 100644 --- a/openbios-devel/arch/sparc64/ofmem_sparc64.c +++ b/openbios-devel/arch/sparc64/ofmem_sparc64.c @@ -120,8 +120,11 @@ ucell ofmem_arch_default_translation_mode( phys_addr_t phys ) return SPITFIRE_TTE_CP | SPITFIRE_TTE_CV | SPITFIRE_TTE_WRITABLE; } - - +ucell ofmem_arch_io_translation_mode( phys_addr_t phys ) +{ + /* Writable, not privileged and not locked */ + return SPITFIRE_TTE_CV | SPITFIRE_TTE_WRITABLE; +} /************************************************************************/ /* init / cleanup */ diff --git a/openbios-devel/drivers/iommu.c b/openbios-devel/drivers/iommu.c index bf3c887..6af5b33 100644 --- a/openbios-devel/drivers/iommu.c +++ b/openbios-devel/drivers/iommu.c @@ -68,7 +68,7 @@ dvma_alloc(int size, unsigned int *pphys) */ mva = (unsigned int) va; mpa = (unsigned int) pa; - map_pages(mpa, mva, npages * PAGE_SIZE, 1); + map_pages(mpa, mva, npages * PAGE_SIZE, ofmem_arch_io_translation_mode(mpa)); /* * Map into IOMMU page table. diff --git a/openbios-devel/include/libopenbios/ofmem.h b/openbios-devel/include/libopenbios/ofmem.h index 2766a95..e350dec 100644 --- a/openbios-devel/include/libopenbios/ofmem.h +++ b/openbios-devel/include/libopenbios/ofmem.h @@ -69,6 +69,7 @@ extern int ofmem_arch_encode_physaddr(ucell *p, phys_addr_t value); extern int ofmem_arch_get_translation_entry_size(void); extern void ofmem_arch_create_translation_entry(ucell *transentry, translation_t *t); extern ucell ofmem_arch_default_translation_mode( phys_addr_t phys ); +extern ucell ofmem_arch_io_translation_mode( phys_addr_t phys ); extern void ofmem_arch_early_map_pages(phys_addr_t phys, ucell virt, ucell size, ucell mode); extern void ofmem_arch_unmap_pages(ucell virt, ucell size); -- 1.7.2.3

1 0

[PATCH 08/13] Remove the existing map_page() function and instead install a transitional API using map_pages() which is almost identical to the OFMEM API.
by Mark Cave-Ayland 31 Dec '10

31 Dec '10

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> --- openbios-devel/arch/sparc32/lib.c | 75 ++++++++++++---------------- openbios-devel/drivers/iommu.c | 6 +-- openbios-devel/include/libopenbios/ofmem.h | 2 +- 3 files changed, 34 insertions(+), 49 deletions(-) diff --git a/openbios-devel/arch/sparc32/lib.c b/openbios-devel/arch/sparc32/lib.c index df9c0c1..b9f33a9 100644 --- a/openbios-devel/arch/sparc32/lib.c +++ b/openbios-devel/arch/sparc32/lib.c @@ -190,49 +190,41 @@ find_pte(unsigned long va, int alloc) return pa2va(pa); } -/* - * Create a memory mapping from va to epa. - */ -int -map_page(unsigned long va, uint64_t epa, int type) +void +map_pages(phys_addr_t phys, unsigned long virt, + unsigned long size, unsigned long mode) { + unsigned long npages, off; uint32_t pte; unsigned long pa; - pa = find_pte(va, 1); + DPRINTF("map_pages: va 0x%lx, pa 0x%llx, size 0x%lx\n", virt, phys, size); - pte = SRMMU_ET_PTE | ((epa & PAGE_MASK) >> 4); - if (type) { /* I/O */ - pte |= SRMMU_REF; - /* SRMMU cannot make Supervisor-only, but not exectutable */ - pte |= SRMMU_PRIV; - } else { /* memory */ - pte |= SRMMU_REF | SRMMU_CACHE; - pte |= SRMMU_PRIV; /* Supervisor only access */ - } - *(uint32_t *)pa = pte; - DPRINTF("map_page: va 0x%lx pa 0x%llx pte 0x%x\n", va, epa, pte); + off = phys & (PAGE_SIZE - 1); + npages = (off + (size - 1) + (PAGE_SIZE - 1)) / PAGE_SIZE; + phys &= ~(uint64_t)(PAGE_SIZE - 1); - return 0; -} + while (npages-- != 0) { + pa = find_pte(virt, 1); -static void map_pages(unsigned long va, uint64_t pa, int type, - unsigned long size) -{ - unsigned long npages, off; + pte = SRMMU_ET_PTE | ((phys & PAGE_MASK) >> 4); - DPRINTF("map_pages: va 0x%lx, pa 0x%llx, size 0x%lx\n", va, pa, size); + if (mode) { /* I/O */ + pte |= SRMMU_REF; + /* SRMMU cannot make Supervisor-only, but not exectutable */ + pte |= SRMMU_PRIV; + } else { /* memory */ + pte |= SRMMU_REF | SRMMU_CACHE; + pte |= SRMMU_PRIV; /* Supervisor only access */ + } - off = pa & (PAGE_SIZE - 1); - npages = (off + (size - 1) + (PAGE_SIZE - 1)) / PAGE_SIZE; - pa &= ~(uint64_t)(PAGE_SIZE - 1); + *(uint32_t *)pa = pte; - while (npages-- != 0) { - map_page(va, pa, type); - va += PAGE_SIZE; - pa += PAGE_SIZE; + virt += PAGE_SIZE; + phys += PAGE_SIZE; } } + /* * Create an I/O mapping to pa[size]. * Returns va of the mapping or 0 if unsuccessful. @@ -252,7 +244,7 @@ map_io(uint64_t pa, int size) if (va == 0) return NULL; - map_pages(va, pa, 1, npages * PAGE_SIZE); + map_pages(pa, va, npages * PAGE_SIZE, 1); return (void *)(va + off); } @@ -312,7 +304,7 @@ ob_map_pages(void) pa <<= 32; pa |= POP() & 0xffffffff; - map_pages(va, pa, 0, size); + map_pages(pa, va, size, 0); DPRINTF("map-page: va 0x%lx pa 0x%llx size 0x%x\n", va, pa, size); } @@ -370,7 +362,7 @@ char *obp_dumb_mmap(char *va, int which_io, unsigned int pa, { uint64_t mpa = ((uint64_t)which_io << 32) | (uint64_t)pa; - map_pages((unsigned long)va, mpa, 0, size); + map_pages(mpa, (unsigned long)va, size, 0); return va; } @@ -410,7 +402,7 @@ char *obp_dumb_memalloc(char *va, unsigned int size) DPRINTF("obp_dumb_memalloc req null -> 0x%p\n", va); } - map_pages((unsigned long)va, totavail[0].num_bytes, 0, size); + map_pages(totavail[0].num_bytes, (unsigned long)va, size, 0); update_memory_properties(); @@ -481,6 +473,7 @@ init_mmu_swift(void) { unsigned int addr, i; unsigned long pa, va; + int size; mem_init(&cmem, (char *) &_vmem, (char *)&_evmem); mem_init(&cio, (char *)&_end, (char *)&_iomem); @@ -501,16 +494,12 @@ init_mmu_swift(void) // text, rodata, data, and bss mapped to end of RAM va = (unsigned long)&_start; - for (; va < (unsigned long)&_end; va += PAGE_SIZE) { - pa = va2pa(va); - map_page(va, pa, 0); - } + size = (unsigned long)&_end - (unsigned long)&_start; + pa = va2pa(va); + map_pages(pa, va, size, 0); // 1:1 mapping for RAM - pa = va = 0; - for (; va < LOWMEMSZ; va += PAGE_SIZE, pa += PAGE_SIZE) { - map_page(va, pa, 0); - } + map_pages(0, 0, LOWMEMSZ, 0); /* * Flush cache diff --git a/openbios-devel/drivers/iommu.c b/openbios-devel/drivers/iommu.c index 716d01e..bf3c887 100644 --- a/openbios-devel/drivers/iommu.c +++ b/openbios-devel/drivers/iommu.c @@ -68,11 +68,7 @@ dvma_alloc(int size, unsigned int *pphys) */ mva = (unsigned int) va; mpa = (unsigned int) pa; - for (i = 0; i < npages; i++) { - map_page(mva, mpa, 1); - mva += PAGE_SIZE; - mpa += PAGE_SIZE; - } + map_pages(mpa, mva, npages * PAGE_SIZE, 1); /* * Map into IOMMU page table. diff --git a/openbios-devel/include/libopenbios/ofmem.h b/openbios-devel/include/libopenbios/ofmem.h index 54868e2..2766a95 100644 --- a/openbios-devel/include/libopenbios/ofmem.h +++ b/openbios-devel/include/libopenbios/ofmem.h @@ -129,7 +129,7 @@ extern struct mem cdvmem; void mem_init(struct mem *t, char *begin, char *limit); void *mem_alloc(struct mem *t, int size, int align); -int map_page(unsigned long va, uint64_t epa, int type); +void map_pages(phys_addr_t phys, unsigned long virt, unsigned long size, unsigned long mode); void *map_io(uint64_t pa, int size); #endif -- 1.7.2.3

1 0

[PATCH 07/13] Switch SPARC32 over to use OFMEM's malloc()/free() internally rather than using it's own implementation.
by Mark Cave-Ayland 31 Dec '10

31 Dec '10

Also juggle the memory to take into account that the allocations are coming from OFMEM, and remove posix_memalign2() since it is no longer required. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> --- openbios-devel/arch/sparc32/ldscript | 3 +- openbios-devel/arch/sparc32/lib.c | 120 ++------------------------- openbios-devel/arch/sparc32/ofmem_sparc32.c | 2 +- 3 files changed, 11 insertions(+), 114 deletions(-) diff --git a/openbios-devel/arch/sparc32/ldscript b/openbios-devel/arch/sparc32/ldscript index da94a56..32c9445 100644 --- a/openbios-devel/arch/sparc32/ldscript +++ b/openbios-devel/arch/sparc32/ldscript @@ -12,8 +12,7 @@ BASE_ADDR = 0xffd00000; /* 16KB stack */ STACK_SIZE = 16384; -/* 256k general alloc + 256k Forth dictionary + 16k Forth memory */ -VMEM_SIZE = (256 + 256 + 16) * 1024; +VMEM_SIZE = 128 * 1024; IOMEM_SIZE = 256 * 1024 + 768 * 1024; SECTIONS diff --git a/openbios-devel/arch/sparc32/lib.c b/openbios-devel/arch/sparc32/lib.c index a5ad8ca..df9c0c1 100644 --- a/openbios-devel/arch/sparc32/lib.c +++ b/openbios-devel/arch/sparc32/lib.c @@ -75,18 +75,6 @@ struct linux_mlist_v0 *ptphys; struct linux_mlist_v0 *ptmap; struct linux_mlist_v0 *ptavail; -static struct { - char *next_malloc; - int left; - alloc_desc_t *mfree; /* list of free malloc blocks */ - - range_t *phys_range; - range_t *virt_range; - - translation_t *trans; /* this is really a translation_t */ -} ofmem; -#define ALLOC_BLOCK (64 * 1024) - /* Private functions for mapping between physical/virtual addresses */ phys_addr_t va2pa(unsigned long va) @@ -108,112 +96,22 @@ pa2va(phys_addr_t pa) return pa; } -// XXX should be posix_memalign -static int -posix_memalign2(void **memptr, size_t alignment, size_t size) -{ - alloc_desc_t *d, **pp; - char *ret; - - if( !size ) - return -1; - - size = (size + (alignment - 1)) & ~(alignment - 1); - size += sizeof(alloc_desc_t); - - /* look in the freelist */ - for( pp=&ofmem.mfree; *pp && (**pp).size < size; pp = &(**pp).next ) - ; - - /* waste at most 4K by taking an entry from the freelist */ - if( *pp && (**pp).size < size + 0x1000 ) { - ret = (char*)*pp + sizeof(alloc_desc_t); - memset( ret, 0, (**pp).size - sizeof(alloc_desc_t) ); - *pp = (**pp).next; - *memptr = ret; - return 0; - } - - if( !ofmem.next_malloc || ofmem.left < size) { - unsigned long alloc_size = ALLOC_BLOCK; - if (size > ALLOC_BLOCK) - alloc_size = size; - // Recover possible leftover - if ((size_t)ofmem.left > sizeof(alloc_desc_t) + 4) { - alloc_desc_t *d_leftover; - - d_leftover = (alloc_desc_t*)ofmem.next_malloc; - d_leftover->size = ofmem.left - sizeof(alloc_desc_t); - free((void *)((unsigned long)d_leftover + - sizeof(alloc_desc_t))); - } - - ofmem.next_malloc = mem_alloc(&cmem, alloc_size, 8); - ofmem.left = alloc_size; - } - - if( ofmem.left < size) { - printk("out of malloc memory (%x)!\n", size ); - return -1; - } - d = (alloc_desc_t*) ofmem.next_malloc; - ofmem.next_malloc += size; - ofmem.left -= size; - - d->next = NULL; - d->size = size; - - ret = (char*)d + sizeof(alloc_desc_t); - memset( ret, 0, size - sizeof(alloc_desc_t) ); - *memptr = ret; - return 0; -} - -void *malloc(int size) +void * +malloc(int size) { - int ret; - void *mem; - - ret = posix_memalign2(&mem, 8, size); - if (ret != 0) - return NULL; - return mem; + return ofmem_malloc(size); } -void free(void *ptr) +void * +realloc( void *ptr, size_t size ) { - alloc_desc_t **pp, *d; - - /* it is legal to free NULL pointers (size zero allocations) */ - if( !ptr ) - return; - - d = (alloc_desc_t*)((unsigned long)ptr - sizeof(alloc_desc_t)); - d->next = ofmem.mfree; - - /* insert in the (sorted) freelist */ - for( pp=&ofmem.mfree; *pp && (**pp).size < d->size ; pp = &(**pp).next ) - ; - d->next = *pp; - *pp = d; + return ofmem_realloc(ptr, size); } -void * -realloc( void *ptr, size_t size ) +void +free(void *ptr) { - alloc_desc_t *d = (alloc_desc_t*)((unsigned long)ptr - sizeof(alloc_desc_t)); - char *p; - - if( !ptr ) - return malloc( size ); - if( !size ) { - free( ptr ); - return NULL; - } - p = malloc( size ); - memcpy( p, ptr, MIN(d->size - sizeof(alloc_desc_t),size) ); - free( ptr ); - return p; + ofmem_free(ptr); } /* diff --git a/openbios-devel/arch/sparc32/ofmem_sparc32.c b/openbios-devel/arch/sparc32/ofmem_sparc32.c index e45af2e..74975e1 100644 --- a/openbios-devel/arch/sparc32/ofmem_sparc32.c +++ b/openbios-devel/arch/sparc32/ofmem_sparc32.c @@ -21,7 +21,7 @@ #define OF_MALLOC_BASE ((char*)OFMEM + ALIGN_SIZE(sizeof(ofmem_t), 8)) -#define MEMSIZE (256 * 1024) +#define MEMSIZE (512 * 1024) static union { char memory[MEMSIZE]; ofmem_t ofmem; -- 1.7.2.3

1 0

[PATCH 06/13] Add ofmem_init() function to openbios.c taking into account that unlike SPARC64, OFMEM needs to be setup *before* the MMU so that the page table allocation routines can use it.
by Mark Cave-Ayland 31 Dec '10

31 Dec '10

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> --- openbios-devel/arch/sparc32/openbios.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/openbios-devel/arch/sparc32/openbios.c b/openbios-devel/arch/sparc32/openbios.c index 1419468..c940a5f 100644 --- a/openbios-devel/arch/sparc32/openbios.c +++ b/openbios-devel/arch/sparc32/openbios.c @@ -25,6 +25,7 @@ #include "packages/video.h" #define NO_QEMU_PROTOS #include "arch/common/fw_cfg.h" +#include "libopenbios/ofmem.h" #define MEMORY_SIZE (16*1024) /* 16K ram for hosted system */ #define DICTIONARY_SIZE (256*1024) /* 256K for the dictionary */ @@ -946,6 +947,9 @@ int openbios(void) if (!hwdef) for(;;); // Internal inconsistency, hang + /* Make sure we setup OFMEM before the MMU as we need malloc() to setup page tables */ + ofmem_init(); + #ifdef CONFIG_DRIVER_SBUS init_mmu_swift(); #endif -- 1.7.2.3

1 0

[PATCH 05/13] Switch IOMMU posix_memalign() calls over to ofmem_posix_memalign(), and then remove the private SPARC32 posix_memalign() implementation since it is no longer required.
by Mark Cave-Ayland 31 Dec '10

31 Dec '10

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> --- openbios-devel/arch/sparc32/lib.c | 15 --------------- openbios-devel/drivers/iommu.c | 4 ++-- openbios-devel/include/libc/stdlib.h | 1 - 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/openbios-devel/arch/sparc32/lib.c b/openbios-devel/arch/sparc32/lib.c index 788d6f5..a5ad8ca 100644 --- a/openbios-devel/arch/sparc32/lib.c +++ b/openbios-devel/arch/sparc32/lib.c @@ -216,21 +216,6 @@ realloc( void *ptr, size_t size ) return p; } -// XXX should be removed -int -posix_memalign(void **memptr, size_t alignment, size_t size) -{ - void *block; - - block = mem_alloc(&cmem, size, alignment); - - if (!block) - return -1; - - *memptr = block; - return 0; -} - /* * Allocate memory. This is reusable. */ diff --git a/openbios-devel/drivers/iommu.c b/openbios-devel/drivers/iommu.c index 019f8b7..716d01e 100644 --- a/openbios-devel/drivers/iommu.c +++ b/openbios-devel/drivers/iommu.c @@ -53,7 +53,7 @@ dvma_alloc(int size, unsigned int *pphys) int ret; npages = (size + (PAGE_SIZE-1)) / PAGE_SIZE; - ret = posix_memalign(&va, npages * PAGE_SIZE, PAGE_SIZE); + ret = ofmem_posix_memalign(&va, npages * PAGE_SIZE, PAGE_SIZE); if (ret != 0) return NULL; @@ -132,7 +132,7 @@ iommu_init(struct iommu *t, uint64_t base) /* Allocate IOMMU page table */ /* Tremendous alignment causes great waste... */ ptsize = (vasize / PAGE_SIZE) * sizeof(int); - ret = posix_memalign((void *)&ptab, ptsize, ptsize); + ret = ofmem_posix_memalign((void *)&ptab, ptsize, ptsize); if (ret != 0) { DPRINTF("Cannot allocate IOMMU table [0x%x]\n", ptsize); for (;;) { } diff --git a/openbios-devel/include/libc/stdlib.h b/openbios-devel/include/libc/stdlib.h index 4059db2..ef08838 100644 --- a/openbios-devel/include/libc/stdlib.h +++ b/openbios-devel/include/libc/stdlib.h @@ -19,7 +19,6 @@ extern void *malloc( int size ); extern void free( void *ptr ); extern void *realloc( void *ptr, size_t size ); -extern int posix_memalign(void **memptr, size_t alignment, size_t size); /* should perhaps go somewhere else... */ extern void qsort( void *base, size_t nmemb, size_t size, int (*compar)(const void*, const void*)); -- 1.7.2.3

1 0

[PATCH 04/13] Switch SPARC32 page tables over to use OFMEM's ofmem_posix_memalign() rather than its internal posix_memalign() function.
by Mark Cave-Ayland 31 Dec '10

31 Dec '10

This requires a corresponding increase in the memory allocated to OFMEM in order to store the page tables. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> --- openbios-devel/arch/sparc32/lib.c | 8 ++++---- openbios-devel/arch/sparc32/ofmem_sparc32.c | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/openbios-devel/arch/sparc32/lib.c b/openbios-devel/arch/sparc32/lib.c index 10599ce..788d6f5 100644 --- a/openbios-devel/arch/sparc32/lib.c +++ b/openbios-devel/arch/sparc32/lib.c @@ -273,7 +273,7 @@ find_pte(unsigned long va, int alloc) pte = l1[(va >> SRMMU_PGDIR_SHIFT) & (SRMMU_PTRS_PER_PGD - 1)]; if ((pte & SRMMU_ET_MASK) == SRMMU_ET_INVALID) { if (alloc) { - ret = posix_memalign(&p, SRMMU_PTRS_PER_PMD * sizeof(int), + ret = ofmem_posix_memalign(&p, SRMMU_PTRS_PER_PMD * sizeof(int), SRMMU_PTRS_PER_PMD * sizeof(int)); if (ret != 0) return ret; @@ -290,7 +290,7 @@ find_pte(unsigned long va, int alloc) pte = *(uint32_t *)pa2va(pa); if ((pte & SRMMU_ET_MASK) == SRMMU_ET_INVALID) { if (alloc) { - ret = posix_memalign(&p, SRMMU_PTRS_PER_PTE * sizeof(void *), + ret = ofmem_posix_memalign(&p, SRMMU_PTRS_PER_PTE * sizeof(void *), SRMMU_PTRS_PER_PTE * sizeof(void *)); if (ret != 0) return ret; @@ -602,9 +602,9 @@ init_mmu_swift(void) mem_init(&cmem, (char *) &_vmem, (char *)&_evmem); mem_init(&cio, (char *)&_end, (char *)&_iomem); - posix_memalign((void *)&context_table, NCTX_SWIFT * sizeof(int), + ofmem_posix_memalign((void *)&context_table, NCTX_SWIFT * sizeof(int), NCTX_SWIFT * sizeof(int)); - posix_memalign((void *)&l1, 256 * sizeof(int), 256 * sizeof(int)); + ofmem_posix_memalign((void *)&l1, 256 * sizeof(int), 256 * sizeof(int)); context_table[0] = (((unsigned long)va2pa((unsigned long)l1)) >> 4) | SRMMU_ET_PTD; diff --git a/openbios-devel/arch/sparc32/ofmem_sparc32.c b/openbios-devel/arch/sparc32/ofmem_sparc32.c index fffd32a..e45af2e 100644 --- a/openbios-devel/arch/sparc32/ofmem_sparc32.c +++ b/openbios-devel/arch/sparc32/ofmem_sparc32.c @@ -21,8 +21,7 @@ #define OF_MALLOC_BASE ((char*)OFMEM + ALIGN_SIZE(sizeof(ofmem_t), 8)) -/* Temporarily very small */ -#define MEMSIZE (1 * 1024) +#define MEMSIZE (256 * 1024) static union { char memory[MEMSIZE]; ofmem_t ofmem; -- 1.7.2.3

1 0

[PATCH 03/13] Alter the SPARC32 entry.S file to allow extra space for the page tables to handle OpenBIOS images up to 2MB.
by Mark Cave-Ayland 31 Dec '10

31 Dec '10

Currently the page tables only allow enough space for a 1.5MB image; however during testing/development it was useful to temporarily allow larger images for debugging. Note that if larger ROM sizes are required for testing, it is necessary to patch qemu to raise the hardcoded limit there too. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> --- openbios-devel/arch/sparc32/entry.S | 52 ++++++++++++++++++++++++----------- 1 files changed, 36 insertions(+), 16 deletions(-) diff --git a/openbios-devel/arch/sparc32/entry.S b/openbios-devel/arch/sparc32/entry.S index 3a4ce4e..9f5356c 100644 --- a/openbios-devel/arch/sparc32/entry.S +++ b/openbios-devel/arch/sparc32/entry.S @@ -38,15 +38,15 @@ * * Top +-------------------------+ * | SMP CPU table | - * | s + 0xf00 ... 0xf0f | - * | s + 0xf0c valid | - * | s + 0xf08 entry | - * | s + 0xf04 ctxtbl | - * | s + 0xf00 ctx | + * | s + 0x1f00 ... 0x1f0f | + * | s + 0x1f0c valid | + * | s + 0x1f08 entry | + * | s + 0x1f04 ctxtbl | + * | s + 0x1f00 ctx | * +-------------------------+ * | Bootstrap | - * | MMU L3 tables 5 * 0x100 | - * | s + 0xa00 ... 0xeff | + * | MMU L3 tables 8 * 0x100 | + * | s + 0xa00 ... 0x11ff | * +-------------------------+ * | Bootstrap | * | MMU L2 tables 2 * 0x100 | @@ -123,11 +123,12 @@ entry: ! Start of private memory in %g6 - set 0x1000, %g3 + set 0x2000, %g3 sub %g1, %g3, %g6 ! Calculate SMP table location - add %g6, 0xf0c, %g2 ! valid? + set 0x1f0c, %g2 + add %g6, %g2, %g2 ! valid? lda [%g2] ASI_M_BYPASS, %g7 sta %g0, [%g2] ASI_M_BYPASS @@ -168,17 +169,20 @@ entry: load_ctx: ! SMP init, jump to user specified address - add %g6, 0xf04, %g5 ! ctxtbl + set 0x1f04, %g5 + add %g6, %g5, %g5 ! ctxtbl lda [%g5] ASI_M_BYPASS, %g2 sta %g0, [%g5] ASI_M_BYPASS set AC_M_CTPR, %g1 sta %g2, [%g1] ASI_M_MMUREGS ! set ctx table ptr - add %g6, 0xf00, %g5 ! ctx + set 0x1f00, %g5 + add %g6, %g5, %g5 ! ctx lda [%g5] ASI_M_BYPASS, %g2 sta %g0, [%g5] ASI_M_BYPASS set AC_M_CXR, %g1 sta %g2, [%g1] ASI_M_MMUREGS ! set context - add %g6, 0xf08, %g5 ! entry + set 0x1f08, %g5 + add %g6, %g5, %g5 ! entry lda [%g5] ASI_M_BYPASS, %g2 sta %g0, [%g5] ASI_M_BYPASS set 1, %g1 @@ -217,7 +221,7 @@ first_cpu: /* Create temporary page tables and map the ROM area to end of RAM. This will be done properly in iommu.c later. */ ! Calculate start of page tables etc. to %g6 - set 0x1000, %g4 + set 0x2000, %g4 sub %g1, %g4, %g6 ! start of private memory mov %g6, %g2 ! ctx table at s+0x0 @@ -273,7 +277,22 @@ first_cpu: srl %g3, 0x4, %g3 or %g3, 0x1, %g3 sta %g3, [%g2] ASI_M_BYPASS - add %g2, 0xa00-0x9e0, %g2 ! s+0xa00 + add %g2, 4, %g2 ! s+0x9e4 + add %g2, 0xf00 - 0x9e4, %g3 ! 6th l3 table for rom at s+0xf00 + srl %g3, 0x4, %g3 + or %g3, 0x1, %g3 + sta %g3, [%g2] ASI_M_BYPASS + add %g2, 4, %g2 ! s+0x9e8 + add %g2, 0x1000 - 0x9e8, %g3 ! 7th l3 table for rom at s+0x1000 + srl %g3, 0x4, %g3 + or %g3, 0x1, %g3 + sta %g3, [%g2] ASI_M_BYPASS + add %g2, 4, %g2 ! s+0x9ec + add %g2, 0x1100 - 0x9ec, %g3 ! 8th l3 table for rom at s+0x1100 + srl %g3, 0x4, %g3 + or %g3, 0x1, %g3 + sta %g3, [%g2] ASI_M_BYPASS + add %g2, 0xa00-0x9ec, %g2 ! s+0xa00 /* Use end of ram for code, rodata, data, and bss sections. SunOS wants to write to trap table... */ @@ -282,6 +301,7 @@ first_cpu: sub %g6, %g4, %g6 sub %g1, %g6, %g3 set 0x1000, %g5 + sub %g3, %g5, %g3 sub %g3, %g5, %g3 ! start of ROM copy mov %g3, %g7 ! save in %g7 srl %g6, 12, %g6 ! # of all pages @@ -311,7 +331,7 @@ first_cpu: bl 1b add %g4, 0x4, %g4 - set 0x1000, %g3 + set 0x2000, %g3 sub %g6, %g3, %g7 ! ctx table at s+0x0 set AC_M_CTPR, %g2 srl %g7, 4, %g7 @@ -360,7 +380,7 @@ highmem: set _start, %o2 sub %o0, %o2, %o0 sub %g6, %o0, %o0 - set 0x1000, %o1 + set 0x2000, %o1 sub %o0, %o1, %o0 ! start of ROM copy sub %o2, %o0, %o0 ! start of ROM copy set va_shift, %g1 -- 1.7.2.3

1 0

[PATCH 02/13] Reduce memory of the Forth machine to 16k.
by Mark Cave-Ayland 31 Dec '10

31 Dec '10

Since this memory is only being used by alloc-mem and free-mem then the majority of memory allocations will not actually be taken from this pool but from the C malloc()/free() implementations instead. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> --- openbios-devel/arch/sparc32/ldscript | 4 ++-- openbios-devel/arch/sparc32/openbios.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/openbios-devel/arch/sparc32/ldscript b/openbios-devel/arch/sparc32/ldscript index a95ef68..da94a56 100644 --- a/openbios-devel/arch/sparc32/ldscript +++ b/openbios-devel/arch/sparc32/ldscript @@ -12,8 +12,8 @@ BASE_ADDR = 0xffd00000; /* 16KB stack */ STACK_SIZE = 16384; -/* 256k general alloc + 256k Forth dictionary + 128k Forth memory */ -VMEM_SIZE = (256 + 256 + 128) * 1024; +/* 256k general alloc + 256k Forth dictionary + 16k Forth memory */ +VMEM_SIZE = (256 + 256 + 16) * 1024; IOMEM_SIZE = 256 * 1024 + 768 * 1024; SECTIONS diff --git a/openbios-devel/arch/sparc32/openbios.c b/openbios-devel/arch/sparc32/openbios.c index 1c86752..1419468 100644 --- a/openbios-devel/arch/sparc32/openbios.c +++ b/openbios-devel/arch/sparc32/openbios.c @@ -26,7 +26,7 @@ #define NO_QEMU_PROTOS #include "arch/common/fw_cfg.h" -#define MEMORY_SIZE (128*1024) /* 16K ram for hosted system */ +#define MEMORY_SIZE (16*1024) /* 16K ram for hosted system */ #define DICTIONARY_SIZE (256*1024) /* 256K for the dictionary */ #define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" #define FW_CFG_SUN4M_DEPTH (FW_CFG_ARCH_LOCAL + 0x00) -- 1.7.2.3

1 0

[PATCH 01/13] Change the SPARC32 build system so that OFMEM is now included within SPARC32 builds.
by Mark Cave-Ayland 31 Dec '10

31 Dec '10

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> --- openbios-devel/arch/sparc32/build.xml | 1 + openbios-devel/arch/sparc32/lib.c | 10 ++ openbios-devel/arch/sparc32/ofmem_sparc32.c | 135 +++++++++++++++++++++ openbios-devel/config/examples/sparc32_config.xml | 2 + 4 files changed, 148 insertions(+), 0 deletions(-) create mode 100644 openbios-devel/arch/sparc32/ofmem_sparc32.c diff --git a/openbios-devel/arch/sparc32/build.xml b/openbios-devel/arch/sparc32/build.xml index 222dfb7..3d2f71d 100644 --- a/openbios-devel/arch/sparc32/build.xml +++ b/openbios-devel/arch/sparc32/build.xml @@ -15,6 +15,7 @@ <object source="udiv.S"/> <object source="linux_load.c"/> <object source="sys_info.c"/> + <object source="ofmem_sparc32.c"/> <object source="romvec.c"/> <object source="call-romvec.S"/> <object source="entry.S"/> diff --git a/openbios-devel/arch/sparc32/lib.c b/openbios-devel/arch/sparc32/lib.c index a30729f..10599ce 100644 --- a/openbios-devel/arch/sparc32/lib.c +++ b/openbios-devel/arch/sparc32/lib.c @@ -497,6 +497,16 @@ void obp_dumb_munmap(__attribute__((unused)) char *va, DPRINTF("obp_dumb_munmap: virta 0x%x, sz %d\n", (unsigned int)va, size); } +void ofmem_arch_unmap_pages(ucell virt, ucell size) +{ + /* Currently do nothing */ +} + +void ofmem_arch_early_map_pages(phys_addr_t phys, ucell virt, ucell size, ucell mode) +{ + /* Currently do nothing */ +} + char *obp_dumb_memalloc(char *va, unsigned int size) { size = (size + 7) & ~7; diff --git a/openbios-devel/arch/sparc32/ofmem_sparc32.c b/openbios-devel/arch/sparc32/ofmem_sparc32.c new file mode 100644 index 0000000..fffd32a --- /dev/null +++ b/openbios-devel/arch/sparc32/ofmem_sparc32.c @@ -0,0 +1,135 @@ +/* + * <ofmem_sparc32.c> + * + * OF Memory manager + * + * Copyright (C) 1999-2004 Samuel Rydh (samuel(a)ibrium.se) + * Copyright (C) 2004 Stefan Reinauer + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation + * + */ + +#include "config.h" +#include "libopenbios/bindings.h" +#include "libc/string.h" +#include "libopenbios/ofmem.h" +#include "asm/asi.h" +#include "pgtsrmmu.h" + +#define OF_MALLOC_BASE ((char*)OFMEM + ALIGN_SIZE(sizeof(ofmem_t), 8)) + +/* Temporarily very small */ +#define MEMSIZE (1 * 1024) +static union { + char memory[MEMSIZE]; + ofmem_t ofmem; +} s_ofmem_data; + +#define OFMEM (&s_ofmem_data.ofmem) +#define TOP_OF_RAM (s_ofmem_data.memory + MEMSIZE) + +translation_t **g_ofmem_translations = &s_ofmem_data.ofmem.trans; + +extern uint32_t qemu_mem_size; + +static inline size_t ALIGN_SIZE(size_t x, size_t a) +{ + return (x + a - 1) & ~(a-1); +} + +static ucell get_heap_top( void ) +{ + return (ucell)TOP_OF_RAM; +} + +ofmem_t* ofmem_arch_get_private(void) +{ + return OFMEM; +} + +void* ofmem_arch_get_malloc_base(void) +{ + return OF_MALLOC_BASE; +} + +ucell ofmem_arch_get_heap_top(void) +{ + return get_heap_top(); +} + +ucell ofmem_arch_get_virt_top(void) +{ + return (ucell)TOP_OF_RAM; +} + +phys_addr_t ofmem_arch_get_phys_top(void) +{ + ofmem_t *ofmem = ofmem_arch_get_private(); + + return (uintptr_t)ofmem->ramsize - 0x1000000; +} + +retain_t *ofmem_arch_get_retained(void) +{ + /* Not used */ + return 0; +} + +int ofmem_arch_get_physaddr_cellsize(void) +{ + return 2; +} + +int ofmem_arch_encode_physaddr(ucell *p, phys_addr_t value) +{ + int n = 0; + + p[n++] = value >> 32; + p[n++] = value; + + return n; +} + +int ofmem_arch_get_translation_entry_size(void) +{ + /* Return size of a single MMU package translation property entry in cells */ + return 3; +} + +void ofmem_arch_create_translation_entry(ucell *transentry, translation_t *t) +{ + /* Generate translation property entry for SPARC. While there is no + formal documentation for this, both Linux kernel and OpenSolaris sources + expect a translation property entry to have the following layout: + + virtual address + length + mode + */ + + transentry[0] = t->virt; + transentry[1] = t->size; + transentry[2] = t->mode; +} + +/************************************************************************/ +/* misc */ +/************************************************************************/ + +ucell ofmem_arch_default_translation_mode( phys_addr_t phys ) +{ + return SRMMU_REF | SRMMU_CACHE | SRMMU_PRIV; +} + +/************************************************************************/ +/* init / cleanup */ +/************************************************************************/ + +void ofmem_init( void ) +{ + memset(&s_ofmem_data, 0, sizeof(s_ofmem_data)); + s_ofmem_data.ofmem.ramsize = qemu_mem_size; +} diff --git a/openbios-devel/config/examples/sparc32_config.xml b/openbios-devel/config/examples/sparc32_config.xml index 233bacb..ba4b7d7 100644 --- a/openbios-devel/config/examples/sparc32_config.xml +++ b/openbios-devel/config/examples/sparc32_config.xml @@ -26,6 +26,8 @@ <option name="CONFIG_DEBLOCKER" type="boolean" value="true"/> <option name="CONFIG_FONT_8X8" type="boolean" value="true"/> <option name="CONFIG_FONT_8X16" type="boolean" value="false"/> + <option name="CONFIG_OFMEM" type="boolean" value="true"/> + <option name="CONFIG_OFMEM_MALLOC_ALIGN" type="integer" value="8"/> <option name="CONFIG_LOADER_AOUT" type="boolean" value="true"/> <option name="CONFIG_LOADER_BOOTINFO" type="boolean" value="false"/> <option name="CONFIG_LOADER_ELF" type="boolean" value="true"/> -- 1.7.2.3

1 0

[PATCH 00/13] Convert SPARC32 to OFMEM v2
by Mark Cave-Ayland 31 Dec '10

31 Dec '10

This patchset converts SPARC32 and its associated devices over from its own private memory routines over to using the OFMEM API as used by PPC and SPARC64. v2: Fix whitespace issues. Fix unused variable causing GCC 4.6.0 to fail. Use PRI* macros for FMT_cell and FMT_ucell changes. v1: Initial patchset. Mark Cave-Ayland (13): Change the SPARC32 build system so that OFMEM is now included within SPARC32 builds. Reduce memory of the Forth machine to 16k. Alter the SPARC32 entry.S file to allow extra space for the page tables to handle OpenBIOS images up to 2MB. Switch SPARC32 page tables over to use OFMEM's ofmem_posix_memalign() rather than its internal posix_memalign() function. Switch IOMMU posix_memalign() calls over to ofmem_posix_memalign(), and then remove the private SPARC32 posix_memalign() implementation since it is no longer required. Add ofmem_init() function to openbios.c taking into account that unlike SPARC64, OFMEM needs to be setup *before* the MMU so that the page table allocation routines can use it. Switch SPARC32 over to use OFMEM's malloc()/free() internally rather than using it's own implementation. Remove the existing map_page() function and instead install a transitional API using map_pages() which is almost identical to the OFMEM API. Introduce ofmem_arch_io_translation_mode() to allow an OFMEM arch to specify different MMU modes for I/O memory mapped regions. Implement ofmem_map_io() within OFMEM as a function to map I/O memory (similar to SPARC32's private map_io() function). Switch all SPARC32 devices over from the private map_io() function over to OFMEM's ofmem_map_io() function. Switch remaining SPARC32 code over to OFMEM. Fix the FMT_cell and FMT_ucell definitions for SPARC32. openbios-devel/arch/ppc/qemu/ofmem.c | 16 ++ openbios-devel/arch/sparc32/build.xml | 1 + openbios-devel/arch/sparc32/console.c | 4 +- openbios-devel/arch/sparc32/entry.S | 52 +++-- openbios-devel/arch/sparc32/ldscript | 3 +- openbios-devel/arch/sparc32/lib.c | 296 +++++---------------- openbios-devel/arch/sparc32/ofmem_sparc32.c | 149 +++++++++++ openbios-devel/arch/sparc32/openbios.c | 6 +- openbios-devel/arch/sparc64/ofmem_sparc64.c | 19 ++- openbios-devel/config/examples/sparc32_config.xml | 2 + openbios-devel/drivers/escc.c | 4 +- openbios-devel/drivers/esp.c | 4 +- openbios-devel/drivers/fw_cfg.c | 2 +- openbios-devel/drivers/iommu.c | 12 +- openbios-devel/drivers/obio.c | 10 +- openbios-devel/drivers/sbus.c | 2 +- openbios-devel/include/arch/sparc32/types.h | 6 +- openbios-devel/include/libc/stdlib.h | 1 - openbios-devel/include/libopenbios/ofmem.h | 12 +- openbios-devel/libopenbios/ofmem_common.c | 52 ++++ 20 files changed, 369 insertions(+), 284 deletions(-) create mode 100644 openbios-devel/arch/sparc32/ofmem_sparc32.c -- 1.7.2.3

1 0

[commit] r997 - trunk/openbios-devel/libopenbios
by repository service 30 Dec '10

30 Dec '10

Author: mcayland Date: Thu Dec 30 23:02:09 2010 New Revision: 997 URL: http://tracker.coreboot.org/trac/openbios/changeset/997 Log: Fix ofmem_posix_memalign() so that it also enforces physical alignment when re-allocating memory from the freelist. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.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 Thu Dec 30 14:56:28 2010 (r996) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Thu Dec 30 23:02:09 2010 (r997) @@ -108,7 +108,11 @@ /* waste at most 4K by taking an entry from the freelist */ if( *pp && (**pp).size < size + 0x1000 ) { - ret = (void *)((uintptr_t)*pp + sizeof(alloc_desc_t)); + /* Alignment should be on physical not virtual address */ + pa = va2pa((uintptr_t)*pp + sizeof(alloc_desc_t)); + pa = align_ptr(pa, alignment); + ret = (void *)pa2va(pa); + memset( ret, 0, (**pp).size - sizeof(alloc_desc_t) ); *pp = (**pp).next;

1 0

[PATCH 00/16] Convert SPARC32 to OFMEM
by Mark Cave-Ayland 30 Dec '10

30 Dec '10

This patchset converts SPARC32 and its associated devices over from its own private memory routines over to using the OFMEM API as used by PPC and SPARC64. v1: Initial patchset. Mark Cave-Ayland (13): Change the SPARC32 build system so that OFMEM is now included within SPARC32 builds. Reduce memory of the Forth machine to 16k. Alter the SPARC32 entry.S file to allow extra space for the page tables to handle OpenBIOS images up to 2MB. Switch SPARC32 page tables over to use OFMEM's ofmem_posix_memalign() rather than its internal posix_memalign() function. Switch IOMMU posix_memalign() calls over to ofmem_posix_memalign(), and then remove the private SPARC32 posix_memalign() implementation since it is no longer required. Add ofmem_init() function to openbios.c taking into account that unlike SPARC64, OFMEM needs to be setup *before* the MMU so that the page table allocation routines can use it. Switch SPARC32 over to use OFMEM's malloc()/free() internally rather than using it's own implementation. Remove the existing map_page() function and instead install a transitional API using map_pages() which is almost identical to the OFMEM API. Introduce ofmem_arch_io_translation_mode() to allow an OFMEM arch to specify different MMU modes for I/O memory mapped regions. Implement ofmem_map_io() within OFMEM as a function to map I/O memory (similar to SPARC32's private map_io() function). Switch all SPARC32 devices over from the private map_io() function over to OFMEM's ofmem_map_io() function. Switch remaining SPARC32 code over to OFMEM. Fix the FMT_cell and FMT_ucell definitions for SPARC32. mcayland (3): Alter ofmem_posix_memalign() so that the resulting pointer is aligned for both physical and virtual addresses. Introduce ofmem_arch_get_phys_top() for specifying the top of physical memory in OFMEM. Change OFMEM to allocate memory from the top of RAM downwards. openbios-devel/arch/ppc/qemu/ofmem.c | 23 ++ openbios-devel/arch/sparc32/build.xml | 1 + openbios-devel/arch/sparc32/console.c | 4 +- openbios-devel/arch/sparc32/entry.S | 52 +++- openbios-devel/arch/sparc32/ldscript | 3 +- openbios-devel/arch/sparc32/lib.c | 306 +++++---------------- openbios-devel/arch/sparc32/ofmem_sparc32.c | 149 ++++++++++ openbios-devel/arch/sparc32/openbios.c | 6 +- openbios-devel/arch/sparc64/ofmem_sparc64.c | 26 ++- openbios-devel/config/examples/sparc32_config.xml | 2 + openbios-devel/drivers/escc.c | 4 +- openbios-devel/drivers/esp.c | 4 +- openbios-devel/drivers/fw_cfg.c | 2 +- openbios-devel/drivers/iommu.c | 12 +- openbios-devel/drivers/obio.c | 10 +- openbios-devel/drivers/sbus.c | 2 +- openbios-devel/include/arch/sparc32/types.h | 4 +- openbios-devel/include/libc/stdlib.h | 1 - openbios-devel/include/libopenbios/ofmem.h | 15 +- openbios-devel/libopenbios/ofmem_common.c | 73 +++++- 20 files changed, 402 insertions(+), 297 deletions(-) create mode 100644 openbios-devel/arch/sparc32/ofmem_sparc32.c -- 1.7.2.3

2 20

Hello. I'm on the driver floppy.c
by Анатолий Литвяков 30 Dec '10

30 Dec '10

sorry for my english, I'm from Russia. I think that you have, and Linux. there is a bug in the team drive_specific_command (0x8e). you pass the first parameter as (FD_Drive & 3). but you have to (( FD_Drive & 3) <5). if I'm wrong then please explain how this team. please reply to this message. thanks in advance.

3 3

[PATCH] Generate Makefile dependencies also from Forth files
by Blue Swirl 30 Dec '10

30 Dec '10

Dependencies between Forth files were not detected, so dictionaries were not regenerated automatically in some cases. Introduce '-M' flag to forthstrap to dump dependency information in Makefile compatible format, based on the Forth 'include' directives. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> --- Makefile.target | 2 +- config/xml/dictionary.xsl | 1 + kernel/bootstrap.c | 30 +++++++++++++++++++++++++++--- 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/Makefile.target b/Makefile.target index 9ae8120..934b95a 100644 --- a/Makefile.target +++ b/Makefile.target @@ -77,4 +77,4 @@ build: all include rules.mak # Include automatically generated dependency files --include $(wildcard $(ODIR)/host/kernel/*.d $(ODIR)/target/*/*.d $(ODIR)/target/*/*/*.d $(ODIR)/target/*/*/*/*.d) +-include $(wildcard $(ODIR)/*.d $(ODIR)/host/kernel/*.d $(ODIR)/target/*/*.d $(ODIR)/target/*/*/*.d $(ODIR)/target/*/*/*/*.d) diff --git a/config/xml/dictionary.xsl b/config/xml/dictionary.xsl index fc61359..52d836a 100644 --- a/config/xml/dictionary.xsl +++ b/config/xml/dictionary.xsl @@ -126,6 +126,7 @@ <xsl:text> -I$(ODIR)/forth</xsl:text> <xsl:text> -D $@</xsl:text> + <xsl:text> -M $@.d</xsl:text> <xsl:if test="$init!=''"> <xsl:text> -d $(ODIR)/</xsl:text><xsl:value-of select="$init"/><xsl:text>.dict</xsl:text> </xsl:if> diff --git a/kernel/bootstrap.c b/kernel/bootstrap.c index 3c3356e..8a45fb7 100644 --- a/kernel/bootstrap.c +++ b/kernel/bootstrap.c @@ -69,6 +69,7 @@ struct include_path { }; static include includes = { ".", NULL }; +static FILE *depfile; static ucell * relocation_address=NULL; static int relocation_length=0; @@ -465,6 +466,10 @@ static FILE *fopen_include(const char *fil) srclines [ cursrc ] = 1; srcfiles [ cursrc++ ] = ret; + if (depfile) { + fprintf(depfile, " %s", fullpath); + } + return ret; } @@ -1025,7 +1030,9 @@ static void new_dictionary(const char *source) " write to output.dict\n" \ " -c|--console output.log\n" \ " write kernel console output to log file\n" \ - " -s|--segfault install segfault handler\n\n" + " -s|--segfault install segfault handler\n" \ + " -M|--dependency-dump file\n" \ + " dump dependencies in Makefile format\n\n" #else #define USAGE "Usage: %s [options] [dictionary file|source file]\n\n" \ " -h show this help\n" \ @@ -1039,7 +1046,7 @@ static void new_dictionary(const char *source) " -c output.log\n" \ " write kernel console output to log file\n" \ " -s install segfault handler\n\n" - + " -M file dump dependencies in Makefile format\n\n" #endif int main(int argc, char *argv[]) @@ -1050,11 +1057,12 @@ int main(int argc, char *argv[]) char *dictname = NULL; char *basedict = NULL; char *consolefile = NULL; + char *depfilename = NULL; unsigned char *bootstrapdict[2]; int c, cnt; - const char *optstring = "VvhsI:d:D:c:?"; + const char *optstring = "VvhsI:d:D:c:M:?"; while (1) { #ifdef __GLIBC__ @@ -1068,6 +1076,7 @@ int main(int argc, char *argv[]) {"source-dictionary", 1, NULL, 'd'}, {"target-dictionary", 1, NULL, 'D'}, {"console", 1, NULL, 'c'}, + {"dependency-dump", 1, NULL, 'M'}, }; /* @@ -1118,6 +1127,11 @@ int main(int argc, char *argv[]) consolefile = optarg; } break; + case 'M': + if (!depfilename) { + depfilename = optarg; + } + break; default: return 1; } @@ -1127,6 +1141,7 @@ int main(int argc, char *argv[]) printk(BANNER); printk("Using source dictionary '%s'\n", basedict); printk("Dumping final dictionary to '%s'\n", dictname); + printk("Dumping dependencies to '%s'\n", depfilename); } if (argc < optind + 1) { @@ -1134,6 +1149,10 @@ int main(int argc, char *argv[]) return 1; } + if (depfilename) { + depfile = fopen(depfilename, "w"); + fprintf(depfile, "%s: ", dictname); + } /* * Get all required resources @@ -1203,6 +1222,11 @@ int main(int argc, char *argv[]) run_dictionary(basedict, consolefile); } + if (depfile) { + fprintf(depfile, "\n"); + fclose(depfile); + depfile = NULL; + } if(errors) break; } -- 1.6.2.4

2 4

Re: [OpenBIOS] [PATCH 15/16] Switch remaining SPARC32 code over to OFMEM.
by Blue Swirl 30 Dec '10

30 Dec '10

On Thu, Dec 30, 2010 at 6:07 PM, Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> wrote: > This patch removes the SPARC32-specific map_pages() function from the IOMMU driver, plus switches obp_dumb_memalloc() > over to use OFMEM. OFMEM property generation is enabled for the /memory and /virtual-memory nodes, and any remaining > traces of the old memory variables are removed. > > Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> > --- > openbios-devel/arch/sparc32/lib.c | 69 +++++++++------------------ > openbios-devel/drivers/iommu.c | 2 +- > openbios-devel/include/libopenbios/ofmem.h | 1 - > 3 files changed, 24 insertions(+), 48 deletions(-) > > diff --git a/openbios-devel/arch/sparc32/lib.c b/openbios-devel/arch/sparc32/lib.c > index 74ac5e7..6b51f1c 100644 > --- a/openbios-devel/arch/sparc32/lib.c > +++ b/openbios-devel/arch/sparc32/lib.c > @@ -53,8 +53,6 @@ struct mem { > char *curp; > }; > > -static struct mem cmem; /* Current memory, virtual */ > -static struct mem cio; /* Current I/O space */ > struct mem cdvmem; /* Current device virtual memory space */ > > unsigned int va_shift; > @@ -190,7 +188,7 @@ find_pte(unsigned long va, int alloc) > return pa2va(pa); > } > > -void > +static void > map_pages(phys_addr_t phys, unsigned long virt, > unsigned long size, unsigned long mode) > { > @@ -353,29 +351,19 @@ void ofmem_arch_early_map_pages(phys_addr_t phys, ucell virt, ucell size, ucell > > char *obp_dumb_memalloc(char *va, unsigned int size) > { > - size = (size + 7) & ~7; > - // XXX should use normal memory alloc > - totavail[0].num_bytes -= size; > - DPRINTF("obp_dumb_memalloc va 0x%p size %x at 0x%x\n", va, size, > - totavail[0].num_bytes); > - > - // If va is null, the allocator is supposed to pick a "suitable" address. > - // (See OpenSolaric prom_alloc.c) There's not any real guidance as > - // to what might be "suitable". So we mimic the behavior of a Sun boot > - // ROM. > - > - if (va == NULL) { > - va = (char *)(totmap[0].start_adr - size); > - totmap[0].start_adr -= size; > - totmap[0].num_bytes += size; > - DPRINTF("obp_dumb_memalloc req null -> 0x%p\n", va); > - } > + phys_addr_t phys; > + ucell virt; > + > + /* Claim physical memory */ > + phys = ofmem_claim_phys(-1, size, CONFIG_OFMEM_MALLOC_ALIGN); > + > + /* Claim virtual memory */ > + virt = ofmem_claim_virt(pointer2cell(va), size, 0); > > - map_pages(totavail[0].num_bytes, (unsigned long)va, size, ofmem_arch_default_translation_mode(totavail[0].num_bytes)); > + /* Map the memory */ > + ofmem_map(phys, virt, size, ofmem_arch_default_translation_mode(phys)); > > - update_memory_properties(); > - > - return va; > + return cell2pointer(virt); > } > > void obp_dumb_memfree(__attribute__((unused))char *va, > @@ -387,6 +375,9 @@ void obp_dumb_memfree(__attribute__((unused))char *va, > void > ob_init_mmu(void) > { > + ucell *reg; > + ofmem_t *ofmem; This variable is not read after it has been initialized, so GCC 4.6.0 complains: CC target/arch/sparc32/lib.o ../arch/sparc32/lib.c: In function 'ob_init_mmu': ../arch/sparc32/lib.c:379:14: error: variable 'ofmem' set but not used [-Werror=unused-but-set-variable] Please remove the variable: diff --git a/arch/sparc32/lib.c b/arch/sparc32/lib.c index 37b33f0..f9956ce 100644 --- a/arch/sparc32/lib.c +++ b/arch/sparc32/lib.c @@ -376,7 +376,6 @@ void ob_init_mmu(void) { ucell *reg; - ofmem_t *ofmem; init_romvec_mem(); @@ -394,7 +393,7 @@ ob_init_mmu(void) ofmem_register(s_phandle_memory, s_phandle_mmu); /* Setup /memory:reg (totphys) property */ - ofmem = ofmem_arch_get_private(); + ofmem_arch_get_private(); reg = malloc(3 * sizeof(ucell)); ofmem_arch_encode_physaddr(reg, 0); /* physical base */ reg[2] = (ucell)ofmem_arch_get_phys_top(); /* size */

1 0

Re: [OpenBIOS] [PATCH 00/16] Convert SPARC32 to OFMEM
by Mark Cave-Ayland 30 Dec '10

30 Dec '10

Hmmmm - it looks like git send-mail found some old files from a previous test checkout and decided to email those out too :( Based upon SVN trunk, patch 4/16 is the first one to applied. Shall I resend a clean patchset? ATB, Mark. -- Mark Cave-Ayland - Senior Technical Architect PostgreSQL - PostGIS Sirius Corporation plc - control through freedom http://www.siriusit.co.uk t: +44 870 608 0063 Sirius Labs: http://www.siriusit.co.uk/labs

2 1

Re: [OpenBIOS] [PATCH 16/16] Fix the FMT_cell and FMT_ucell definitions for SPARC32.
by Andreas Färber 30 Dec '10

30 Dec '10

Am 30.12.2010 um 19:07 schrieb Mark Cave-Ayland: > This is required to enable a build with CONFIG_DEBUG_OFMEM set to > true to complete successfully. > > Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> > --- > openbios-devel/include/arch/sparc32/types.h | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/openbios-devel/include/arch/sparc32/types.h b/openbios- > devel/include/arch/sparc32/types.h > index 444d648..e4f0f0d 100644 > --- a/openbios-devel/include/arch/sparc32/types.h > +++ b/openbios-devel/include/arch/sparc32/types.h > @@ -46,8 +46,8 @@ typedef uint32_t ucell; > typedef long long dcell; > typedef unsigned long long ducell; > > -#define FMT_cell "%ld" > -#define FMT_ucell "%lu" > +#define FMT_cell "%d" > +#define FMT_ucell "%u" Please use PRI{d,x}32. This may or may not require a pending patch of mine from the prom_args_t series. > #define FMT_ucellx "%08x" > #define FMT_ucellX "%08X" > > -- > 1.7.2.3 > > > -- > OpenBIOS http://openbios.org/ > Mailinglist: http://lists.openbios.org/mailman/listinfo > Free your System - May the Forth be with you

1 1

[commit] r996 - trunk/openbios-devel/libopenbios
by repository service 30 Dec '10

30 Dec '10

Author: mcayland Date: Thu Dec 30 14:56:28 2010 New Revision: 996 URL: http://tracker.coreboot.org/trac/openbios/changeset/996 Log: Change OFMEM to allocate memory from the top of RAM downwards. At the moment OFMEM allocates memory from the bottom of RAM upwards, however many loaders/kernels initialise themselves in lower memory areas which can cause them to be overwritten by subsequent memory allocations. Mimic the existing SPARC32 behaviour by allocating physical and virtual memory from the top of RAM downwards. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.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 Thu Dec 30 14:56:24 2010 (r995) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Thu Dec 30 14:56:28 2010 (r996) @@ -511,7 +511,7 @@ " align=" FMT_ucellx "\n", phys, size, align); - return ofmem_claim_phys_( phys, size, align, 0, ofmem_arch_get_phys_top(), 0 ); + return ofmem_claim_phys_( phys, size, align, 0, ofmem_arch_get_phys_top(), 1 ); } static ucell ofmem_claim_virt_( ucell virt, ucell size, ucell align, @@ -544,7 +544,7 @@ /* printk("+ ofmem_claim virt %08lx %lx %ld\n", virt, size, align ); */ return ofmem_claim_virt_( virt, size, align, - get_ram_size(), ofmem_arch_get_virt_top(), 0 ); + get_ram_size(), ofmem_arch_get_virt_top(), 1 ); } /* if align != 0, phys is ignored. Returns -1 on error */

1 0

[commit] r995 - in trunk/openbios-devel: arch/ppc/qemu arch/sparc64 include/libopenbios libopenbios
by repository service 30 Dec '10

30 Dec '10

Author: mcayland Date: Thu Dec 30 14:56:24 2010 New Revision: 995 URL: http://tracker.coreboot.org/trac/openbios/changeset/995 Log: Introduce ofmem_arch_get_phys_top() for specifying the top of physical memory in OFMEM. At the same time, teach OFMEM to make use of it when calculating the /memory available property. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c trunk/openbios-devel/include/libopenbios/ofmem.h trunk/openbios-devel/libopenbios/ofmem_common.c Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c Thu Dec 30 14:56:20 2010 (r994) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Thu Dec 30 14:56:24 2010 (r995) @@ -115,6 +115,13 @@ return IO_BASE; } +phys_addr_t ofmem_arch_get_phys_top(void) +{ + ofmem_t *ofmem = ofmem_arch_get_private(); + + return ofmem->ramsize; +} + void ofmem_arch_unmap_pages(ucell virt, ucell size) { /* kill page mappings in provided range */ Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Thu Dec 30 14:56:20 2010 (r994) +++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Thu Dec 30 14:56:24 2010 (r995) @@ -63,6 +63,13 @@ return (ucell)TOP_OF_RAM; } +phys_addr_t ofmem_arch_get_phys_top(void) +{ + ofmem_t *ofmem = ofmem_arch_get_private(); + + return ofmem->ramsize; +} + retain_t *ofmem_arch_get_retained(void) { /* Retained area is at the top of physical RAM */ Modified: trunk/openbios-devel/include/libopenbios/ofmem.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/ofmem.h Thu Dec 30 14:56:20 2010 (r994) +++ trunk/openbios-devel/include/libopenbios/ofmem.h Thu Dec 30 14:56:24 2010 (r995) @@ -62,6 +62,7 @@ extern void* ofmem_arch_get_malloc_base(void); extern ucell ofmem_arch_get_heap_top(void); extern ucell ofmem_arch_get_virt_top(void); +extern phys_addr_t ofmem_arch_get_phys_top(void); extern retain_t* ofmem_arch_get_retained(void); extern int ofmem_arch_get_physaddr_cellsize(void); extern int ofmem_arch_encode_physaddr(ucell *p, phys_addr_t value); Modified: trunk/openbios-devel/libopenbios/ofmem_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/ofmem_common.c Thu Dec 30 14:56:20 2010 (r994) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Thu Dec 30 14:56:24 2010 (r995) @@ -354,7 +354,7 @@ ofmem_t *ofmem = ofmem_arch_get_private(); ofmem_update_memory_available(s_phandle_memory, ofmem->phys_range, - &phys_range_prop, &phys_range_prop_size, &phys_range_prop_used, get_ram_size()); + &phys_range_prop, &phys_range_prop_size, &phys_range_prop_used, ofmem_arch_get_phys_top()); ofmem_update_memory_available(s_phandle_mmu, ofmem->virt_range, &virt_range_prop, &virt_range_prop_size, &virt_range_prop_used, -1ULL); ofmem_update_mmu_translations(); @@ -481,7 +481,7 @@ } static phys_addr_t ofmem_claim_phys_( phys_addr_t phys, ucell size, ucell align, - ucell min, ucell max, int reverse ) + phys_addr_t min, phys_addr_t max, int reverse ) { ofmem_t *ofmem = ofmem_arch_get_private(); if( !align ) { @@ -511,7 +511,7 @@ " align=" FMT_ucellx "\n", phys, size, align); - return ofmem_claim_phys_( phys, size, align, 0, get_ram_size(), 0 ); + return ofmem_claim_phys_( phys, size, align, 0, ofmem_arch_get_phys_top(), 0 ); } static ucell ofmem_claim_virt_( ucell virt, ucell size, ucell align, @@ -591,7 +591,7 @@ } else { if( align < 0x1000 ) align = 0x1000; - phys = ofmem_claim_phys_( addr, size, align, 0, get_ram_size(), 1 /* reverse */ ); + 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 ) { OFMEM_TRACE("ofmem_claim failed\n");

1 0

[commit] r994 - trunk/openbios-devel/libopenbios
by repository service 30 Dec '10

30 Dec '10

Author: mcayland Date: Thu Dec 30 14:56:20 2010 New Revision: 994 URL: http://tracker.coreboot.org/trac/openbios/changeset/994 Log: Alter ofmem_posix_memalign() so that the resulting pointer is aligned for both physical and virtual addresses. Some uses of ofmem_posix_memalign() need to ensure that the alignment requirement is for physical as well as virtual addresses, e.g. for MMU page tables. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.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 Thu Dec 30 14:56:17 2010 (r993) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Thu Dec 30 14:56:20 2010 (r994) @@ -33,9 +33,9 @@ return (x + a - 1) & ~(a - 1); } -static inline void * align_ptr(uintptr_t x, size_t a) +static inline phys_addr_t align_ptr(uintptr_t x, size_t a) { - return (void *)((x + a - 1) & ~(a - 1)); + return (x + a - 1) & ~(a - 1); } static ucell get_ram_size( void ) @@ -92,6 +92,7 @@ alloc_desc_t *d, **pp; void *ret; ucell top; + phys_addr_t pa; if( !size ) return ENOMEM; @@ -117,7 +118,11 @@ top = ofmem_arch_get_heap_top(); - ret = align_ptr((uintptr_t)ofmem->next_malloc + sizeof(alloc_desc_t), alignment); + /* Alignment should be on physical not virtual address */ + pa = va2pa((uintptr_t)ofmem->next_malloc + sizeof(alloc_desc_t)); + pa = align_ptr(pa, alignment); + ret = (void *)pa2va(pa); + if( pointer2cell(ret) + size > top ) { printk("out of malloc memory (%x)!\n", size ); return ENOMEM;

1 0

[commit] r993 - trunk/openbios-devel/arch/ppc/qemu
by repository service 30 Dec '10

30 Dec '10

Author: mcayland Date: Thu Dec 30 14:56:17 2010 New Revision: 993 URL: http://tracker.coreboot.org/trac/openbios/changeset/993 Log: Introduce va2pa() and pa2va() functions for PPC for subsequent use by OFMEM. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c Thu Dec 30 14:56:14 2010 (r992) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Thu Dec 30 14:56:17 2010 (r993) @@ -180,6 +180,27 @@ /* OF private allocations */ /************************************************************************/ +/* Private functions for mapping between physical/virtual addresses */ +phys_addr_t +va2pa(unsigned long va) +{ + if (va >= OF_CODE_START && va < OF_CODE_START + OF_CODE_SIZE) { + return (phys_addr_t)get_rom_base() - OF_CODE_START + va; + } else { + return (phys_addr_t)va; + } +} + +unsigned long +pa2va(phys_addr_t pa) +{ + if ((pa - get_rom_base() + OF_CODE_START >= OF_CODE_START) && + (pa - get_rom_base() + OF_CODE_START < OF_CODE_START + OF_CODE_SIZE)) + return (unsigned long)pa - get_rom_base() + OF_CODE_START; + else + return (unsigned long)pa; +} + void * malloc(int size) {

1 0

[commit] r992 - in trunk/openbios-devel: include/libopenbios libopenbios
by repository service 30 Dec '10

30 Dec '10

Author: mcayland Date: Thu Dec 30 14:56:14 2010 New Revision: 992 URL: http://tracker.coreboot.org/trac/openbios/changeset/992 Log: Introduce ofmem_posix_memalign() function for arbitrary alignment. Rework ofmem_malloc() so that it takes a parameter specifying the alignment for the allocation and then change the API to match that of posix_memalign(). Then create ofmem_malloc() as a simple wrapper function onto ofmem_posix_memalign() using a default alignment of CONFIG_OFMEM_MALLOC_ALIGN. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.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 Thu Dec 30 14:56:12 2010 (r991) +++ trunk/openbios-devel/include/libopenbios/ofmem.h Thu Dec 30 14:56:14 2010 (r992) @@ -80,6 +80,7 @@ extern unsigned long pa2va(phys_addr_t pa); /* malloc interface */ +extern int ofmem_posix_memalign( void **memptr, size_t alignment, size_t size ); extern void* ofmem_malloc( size_t size ); extern void ofmem_free( void *ptr ); extern void* ofmem_realloc( void *ptr, size_t size ); Modified: trunk/openbios-devel/libopenbios/ofmem_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/ofmem_common.c Thu Dec 30 14:56:12 2010 (r991) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Thu Dec 30 14:56:14 2010 (r992) @@ -86,7 +86,7 @@ /* OF private allocations */ /************************************************************************/ -void* ofmem_malloc( size_t size ) +int ofmem_posix_memalign( void **memptr, size_t alignment, size_t size ) { ofmem_t *ofmem = ofmem_arch_get_private(); alloc_desc_t *d, **pp; @@ -94,12 +94,12 @@ ucell top; if( !size ) - return NULL; + return ENOMEM; if( !ofmem->next_malloc ) ofmem->next_malloc = (char*)ofmem_arch_get_malloc_base(); - size = align_size(size + sizeof(alloc_desc_t), CONFIG_OFMEM_MALLOC_ALIGN); + size = align_size(size + sizeof(alloc_desc_t), alignment); /* look in the freelist */ for( pp=&ofmem->mfree; *pp && (**pp).size < size; pp = &(**pp).next ) { @@ -110,15 +110,17 @@ ret = (void *)((uintptr_t)*pp + sizeof(alloc_desc_t)); memset( ret, 0, (**pp).size - sizeof(alloc_desc_t) ); *pp = (**pp).next; - return ret; + + *memptr = ret; + return 0; } top = ofmem_arch_get_heap_top(); - ret = align_ptr((uintptr_t)ofmem->next_malloc + sizeof(alloc_desc_t), CONFIG_OFMEM_MALLOC_ALIGN); + ret = align_ptr((uintptr_t)ofmem->next_malloc + sizeof(alloc_desc_t), alignment); if( pointer2cell(ret) + size > top ) { printk("out of malloc memory (%x)!\n", size ); - return NULL; + return ENOMEM; } d = (alloc_desc_t*)((uintptr_t)ret - sizeof(alloc_desc_t)); @@ -129,7 +131,23 @@ memset( ret, 0, size - sizeof(alloc_desc_t) ); - return ret; + *memptr = ret; + return 0; +} + +void* ofmem_malloc( size_t size ) +{ + void *memptr; + int res; + + res = ofmem_posix_memalign( &memptr, CONFIG_OFMEM_MALLOC_ALIGN, size ); + if (!res) { + /* Success */ + return memptr; + } else { + /* Failure */ + return NULL; + } } void ofmem_free( void *ptr )

1 0

[commit] r991 - trunk/openbios-devel/libopenbios
by repository service 30 Dec '10

30 Dec '10

Author: mcayland Date: Thu Dec 30 14:56:12 2010 New Revision: 991 URL: http://tracker.coreboot.org/trac/openbios/changeset/991 Log: Fix alignment of memory allocated by OFMEM's ofmem_malloc(). A casual glance at the source code suggests that pointers returned by ofmem_malloc() are aligned, but in fact they are not because sizeof(alloc_desc_t) is added to the final pointer return value. Create some additional padding after the previous value of ofmem->next_malloc so we can store the alloc_desc_t underneath the final return pointer in memory, thus ensuring that the final pointer is aligned correctly. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.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 Thu Dec 30 14:28:36 2010 (r990) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Thu Dec 30 14:56:12 2010 (r991) @@ -28,9 +28,14 @@ //#define OFMEM_FILL_RANGE -static inline size_t ALIGN_SIZE(size_t x, size_t a) +static inline size_t align_size(size_t x, size_t a) { - return (x + a - 1) & ~(a-1); + return (x + a - 1) & ~(a - 1); +} + +static inline void * align_ptr(uintptr_t x, size_t a) +{ + return (void *)((x + a - 1) & ~(a - 1)); } static ucell get_ram_size( void ) @@ -85,7 +90,7 @@ { ofmem_t *ofmem = ofmem_arch_get_private(); alloc_desc_t *d, **pp; - char *ret; + void *ret; ucell top; if( !size ) @@ -94,7 +99,7 @@ if( !ofmem->next_malloc ) ofmem->next_malloc = (char*)ofmem_arch_get_malloc_base(); - size = ALIGN_SIZE(size + sizeof(alloc_desc_t), CONFIG_OFMEM_MALLOC_ALIGN); + size = align_size(size + sizeof(alloc_desc_t), CONFIG_OFMEM_MALLOC_ALIGN); /* look in the freelist */ for( pp=&ofmem->mfree; *pp && (**pp).size < size; pp = &(**pp).next ) { @@ -102,7 +107,7 @@ /* waste at most 4K by taking an entry from the freelist */ if( *pp && (**pp).size < size + 0x1000 ) { - ret = (char*)*pp + sizeof(alloc_desc_t); + ret = (void *)((uintptr_t)*pp + sizeof(alloc_desc_t)); memset( ret, 0, (**pp).size - sizeof(alloc_desc_t) ); *pp = (**pp).next; return ret; @@ -110,18 +115,18 @@ top = ofmem_arch_get_heap_top(); - if( pointer2cell(ofmem->next_malloc) + size > top ) { + ret = align_ptr((uintptr_t)ofmem->next_malloc + sizeof(alloc_desc_t), CONFIG_OFMEM_MALLOC_ALIGN); + if( pointer2cell(ret) + size > top ) { printk("out of malloc memory (%x)!\n", size ); return NULL; } - d = (alloc_desc_t*) ofmem->next_malloc; + d = (alloc_desc_t*)((uintptr_t)ret - sizeof(alloc_desc_t)); ofmem->next_malloc += size; d->next = NULL; d->size = size; - ret = (char*)d + sizeof(alloc_desc_t); memset( ret, 0, size - sizeof(alloc_desc_t) ); return ret;

1 0

[commit] r990 - in trunk/openbios-devel: arch/sparc32 arch/sparc64 include/libopenbios
by repository service 30 Dec '10

30 Dec '10

Author: mcayland Date: Thu Dec 30 14:28:36 2010 New Revision: 990 URL: http://tracker.coreboot.org/trac/openbios/changeset/990 Log: Remove inline declaration from existing va2pa() and pa2va() functions as suggested by Blue. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc32/lib.c trunk/openbios-devel/arch/sparc64/lib.c trunk/openbios-devel/include/libopenbios/ofmem.h Modified: trunk/openbios-devel/arch/sparc32/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/lib.c Tue Dec 28 22:41:11 2010 (r989) +++ trunk/openbios-devel/arch/sparc32/lib.c Thu Dec 30 14:28:36 2010 (r990) @@ -88,7 +88,7 @@ #define ALLOC_BLOCK (64 * 1024) /* Private functions for mapping between physical/virtual addresses */ -inline phys_addr_t +phys_addr_t va2pa(unsigned long va) { if ((va >= (unsigned long)&_start) && @@ -98,7 +98,7 @@ return va; } -inline unsigned long +unsigned long pa2va(phys_addr_t pa) { if ((pa + va_shift >= (unsigned long)&_start) && Modified: trunk/openbios-devel/arch/sparc64/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/lib.c Tue Dec 28 22:41:11 2010 (r989) +++ trunk/openbios-devel/arch/sparc64/lib.c Thu Dec 30 14:28:36 2010 (r990) @@ -37,7 +37,7 @@ } /* Private functions for mapping between physical/virtual addresses */ -inline phys_addr_t +phys_addr_t va2pa(unsigned long va) { if ((va >= (unsigned long)&_start) && @@ -47,7 +47,7 @@ return va; } -inline unsigned long +unsigned long pa2va(phys_addr_t pa) { if ((pa + va_shift >= (unsigned long)&_start) && Modified: trunk/openbios-devel/include/libopenbios/ofmem.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/ofmem.h Tue Dec 28 22:41:11 2010 (r989) +++ trunk/openbios-devel/include/libopenbios/ofmem.h Thu Dec 30 14:28:36 2010 (r990) @@ -76,8 +76,8 @@ ucell mode ); /* Private functions for mapping between physical/virtual addresses */ -extern inline phys_addr_t va2pa(unsigned long va); -extern inline unsigned long pa2va(phys_addr_t pa); +extern phys_addr_t va2pa(unsigned long va); +extern unsigned long pa2va(phys_addr_t pa); /* malloc interface */ extern void* ofmem_malloc( size_t size );

1 0

Re: [OpenBIOS] [PATCH 2/6] Introduce ofmem_posix_memalign() function for arbitrary alignment.
by Blue Swirl 29 Dec '10

29 Dec '10

On Wed, Dec 29, 2010 at 11:07 AM, Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> wrote: > Rework ofmem_malloc() so that it takes a parameter specifying the alignment for the allocation and then change the API > to match that of posix_memalign(). Then create ofmem_malloc() as a simple wrapper function onto ofmem_posix_memalign() > using a default alignment of CONFIG_OFMEM_MALLOC_ALIGN. > > Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> > --- > openbios-devel/include/libopenbios/ofmem.h | 1 + > openbios-devel/libopenbios/ofmem_common.c | 32 +++++++++++++++++++++------ > 2 files changed, 26 insertions(+), 7 deletions(-) > > diff --git a/openbios-devel/include/libopenbios/ofmem.h b/openbios-devel/include/libopenbios/ofmem.h > index 7b49e48..3d8ddbf 100644 > --- a/openbios-devel/include/libopenbios/ofmem.h > +++ b/openbios-devel/include/libopenbios/ofmem.h > @@ -80,6 +80,7 @@ extern inline phys_addr_t va2pa(unsigned long va); > extern inline unsigned long pa2va(phys_addr_t pa); > > /* malloc interface */ > +extern int ofmem_posix_memalign( void **memptr, int alignment, size_t size ); Actually the API for posix_memalign uses size_t for alignment.

1 0

Re: [OpenBIOS] [PATCH 3/6] Introduce va2pa() and pa2va() functions for PPC for subsequent use by OFMEM.
by Blue Swirl 29 Dec '10

29 Dec '10

On Wed, Dec 29, 2010 at 11:07 AM, Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> wrote: > Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> > --- > openbios-devel/arch/ppc/qemu/ofmem.c | 21 +++++++++++++++++++++ > 1 files changed, 21 insertions(+), 0 deletions(-) > > diff --git a/openbios-devel/arch/ppc/qemu/ofmem.c b/openbios-devel/arch/ppc/qemu/ofmem.c > index c21a112..44b5ef4 100644 > --- a/openbios-devel/arch/ppc/qemu/ofmem.c > +++ b/openbios-devel/arch/ppc/qemu/ofmem.c > @@ -180,6 +180,27 @@ void ofmem_arch_create_translation_entry(ucell *transentry, translation_t *t) > /* OF private allocations */ > /************************************************************************/ > > +/* Private functions for mapping between physical/virtual addresses */ > +inline phys_addr_t I'd remove 'inline' from both. > +va2pa(unsigned long va) > +{ > + if (va >= OF_CODE_START && va < OF_CODE_START + OF_CODE_SIZE) { > + return (phys_addr_t)get_rom_base() - OF_CODE_START + va; > + } else { > + return (phys_addr_t)va; > + } > +} > + > +inline unsigned long > +pa2va(phys_addr_t pa) > +{ > + if ((pa - get_rom_base() + OF_CODE_START >= OF_CODE_START) && > + (pa - get_rom_base() + OF_CODE_START < OF_CODE_START + OF_CODE_SIZE)) > + return (unsigned long)pa - get_rom_base() + OF_CODE_START; > + else > + return (unsigned long)pa; > +} > + > void * > malloc(int size) > { > -- > 1.7.2.3 > > > -- > OpenBIOS http://openbios.org/ > Mailinglist: http://lists.openbios.org/mailman/listinfo > Free your System - May the Forth be with you >

1 0

[commit] r989 - in trunk/openbios-devel: arch/sparc32 arch/sparc64 include/arch/sparc32 include/arch/sparc64 include/libopenbios
by repository service 29 Dec '10

29 Dec '10

Author: mcayland Date: Tue Dec 28 22:41:11 2010 New Revision: 989 URL: http://tracker.coreboot.org/trac/openbios/changeset/989 Log: Move pa2va() and va2pa() inline functions from the io.h header files to lib.c for both SPARC32 and SPARC64. Also introduce the correct phys_addr_t type for physical addresses. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc32/lib.c trunk/openbios-devel/arch/sparc64/lib.c trunk/openbios-devel/include/arch/sparc32/io.h trunk/openbios-devel/include/arch/sparc64/io.h trunk/openbios-devel/include/libopenbios/ofmem.h Modified: trunk/openbios-devel/arch/sparc32/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/lib.c Fri Dec 24 23:36:33 2010 (r988) +++ trunk/openbios-devel/arch/sparc32/lib.c Tue Dec 28 22:41:11 2010 (r989) @@ -87,6 +87,27 @@ } ofmem; #define ALLOC_BLOCK (64 * 1024) +/* Private functions for mapping between physical/virtual addresses */ +inline phys_addr_t +va2pa(unsigned long va) +{ + if ((va >= (unsigned long)&_start) && + (va < (unsigned long)&_end)) + return va - va_shift; + else + return va; +} + +inline unsigned long +pa2va(phys_addr_t pa) +{ + if ((pa + va_shift >= (unsigned long)&_start) && + (pa + va_shift < (unsigned long)&_end)) + return pa + va_shift; + else + return pa; +} + // XXX should be posix_memalign static int posix_memalign2(void **memptr, size_t alignment, size_t size) Modified: trunk/openbios-devel/arch/sparc64/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/lib.c Fri Dec 24 23:36:33 2010 (r988) +++ trunk/openbios-devel/arch/sparc64/lib.c Tue Dec 28 22:41:11 2010 (r989) @@ -36,6 +36,27 @@ return i; } +/* Private functions for mapping between physical/virtual addresses */ +inline phys_addr_t +va2pa(unsigned long va) +{ + if ((va >= (unsigned long)&_start) && + (va < (unsigned long)&_end)) + return va - va_shift; + else + return va; +} + +inline unsigned long +pa2va(phys_addr_t pa) +{ + if ((pa + va_shift >= (unsigned long)&_start) && + (pa + va_shift < (unsigned long)&_end)) + return pa + va_shift; + else + return pa; +} + void *malloc(int size) { return ofmem_malloc(size); Modified: trunk/openbios-devel/include/arch/sparc32/io.h ============================================================================== --- trunk/openbios-devel/include/arch/sparc32/io.h Fri Dec 24 23:36:33 2010 (r988) +++ trunk/openbios-devel/include/arch/sparc32/io.h Tue Dec 28 22:41:11 2010 (r989) @@ -8,26 +8,6 @@ // Defined in ldscript extern char _start, _data, _stack, _estack, _end, _vmem, _evmem, _iomem; -static inline unsigned long -va2pa(unsigned long va) -{ - if ((va >= (unsigned long)&_start) && - (va < (unsigned long)&_end)) - return va - va_shift; - else - return va; -} - -static inline unsigned long -pa2va(unsigned long pa) -{ - if ((pa + va_shift >= (unsigned long)&_start) && - (pa + va_shift < (unsigned long)&_end)) - return pa + va_shift; - else - return pa; -} - // XXX check use and merge #define phys_to_virt(phys) ((void *) ((unsigned long) (phys))) #define virt_to_phys(virt) ((unsigned long) (virt)) Modified: trunk/openbios-devel/include/arch/sparc64/io.h ============================================================================== --- trunk/openbios-devel/include/arch/sparc64/io.h Fri Dec 24 23:36:33 2010 (r988) +++ trunk/openbios-devel/include/arch/sparc64/io.h Tue Dec 28 22:41:11 2010 (r989) @@ -11,26 +11,6 @@ // Defined in ldscript extern char _start, _data, _stack, _estack, _end, _vmem, _evmem, _iomem; -static inline unsigned long -va2pa(unsigned long va) -{ - if ((va >= (unsigned long)&_data) && - (va < (unsigned long)&_end)) - return va - va_shift; - else - return va; -} - -static inline unsigned long -pa2va(unsigned long pa) -{ - if ((pa + va_shift >= (unsigned long)&_data) && - (pa + va_shift< (unsigned long)&_end)) - return pa + va_shift; - else - return pa; -} - // XXX check use and merge #define phys_to_virt(phys) ((void *) ((unsigned long) (phys))) #define virt_to_phys(virt) ((unsigned long) (virt)) Modified: trunk/openbios-devel/include/libopenbios/ofmem.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/ofmem.h Fri Dec 24 23:36:33 2010 (r988) +++ trunk/openbios-devel/include/libopenbios/ofmem.h Tue Dec 28 22:41:11 2010 (r989) @@ -75,6 +75,10 @@ extern int ofmem_map_page_range( phys_addr_t phys, ucell virt, ucell size, ucell mode ); +/* Private functions for mapping between physical/virtual addresses */ +extern inline phys_addr_t va2pa(unsigned long va); +extern inline unsigned long pa2va(phys_addr_t pa); + /* malloc interface */ extern void* ofmem_malloc( size_t size ); extern void ofmem_free( void *ptr );

2 1

[PATCH 6/6] Change OFMEM to allocate memory from the top of RAM downwards.
by Mark Cave-Ayland 29 Dec '10

29 Dec '10

At the moment OFMEM allocates memory from the bottom of RAM upwards, however many loaders/kernels initialise themselves in lower memory areas which can cause them to be overwritten by subsequent memory allocations. Mimic the existing SPARC32 behaviour by allocating physical and virtual memory from the top of RAM downwards. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> --- openbios-devel/libopenbios/ofmem_common.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openbios-devel/libopenbios/ofmem_common.c b/openbios-devel/libopenbios/ofmem_common.c index a7a0edf..63a0783 100644 --- a/openbios-devel/libopenbios/ofmem_common.c +++ b/openbios-devel/libopenbios/ofmem_common.c @@ -511,7 +511,7 @@ phys_addr_t ofmem_claim_phys( phys_addr_t phys, ucell size, ucell align ) " align=" FMT_ucellx "\n", phys, size, align); - return ofmem_claim_phys_( phys, size, align, 0, ofmem_arch_get_phys_top(), 0 ); + return ofmem_claim_phys_( phys, size, align, 0, ofmem_arch_get_phys_top(), 1 ); } static ucell ofmem_claim_virt_( ucell virt, ucell size, ucell align, @@ -544,7 +544,7 @@ ucell ofmem_claim_virt( ucell virt, ucell size, ucell align ) /* printk("+ ofmem_claim virt %08lx %lx %ld\n", virt, size, align ); */ return ofmem_claim_virt_( virt, size, align, - get_ram_size(), ofmem_arch_get_virt_top(), 0 ); + get_ram_size(), ofmem_arch_get_virt_top(), 1 ); } /* if align != 0, phys is ignored. Returns -1 on error */ -- 1.7.2.3

1 0

[PATCH 5/6] Introduce ofmem_arch_get_phys_top() for specifying the top of physical memory in OFMEM.
by Mark Cave-Ayland 29 Dec '10

29 Dec '10

At the same time, teach OFMEM to make use of it when calculating the /memory available property. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> --- openbios-devel/arch/ppc/qemu/ofmem.c | 7 +++++++ openbios-devel/arch/sparc64/ofmem_sparc64.c | 7 +++++++ openbios-devel/include/libopenbios/ofmem.h | 1 + openbios-devel/libopenbios/ofmem_common.c | 8 ++++---- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/openbios-devel/arch/ppc/qemu/ofmem.c b/openbios-devel/arch/ppc/qemu/ofmem.c index 44b5ef4..8f52bdf 100644 --- a/openbios-devel/arch/ppc/qemu/ofmem.c +++ b/openbios-devel/arch/ppc/qemu/ofmem.c @@ -115,6 +115,13 @@ ucell ofmem_arch_get_virt_top(void) return IO_BASE; } +phys_addr_t ofmem_arch_get_phys_top(void) +{ + ofmem_t *ofmem = ofmem_arch_get_private(); + + return ofmem->ramsize; +} + void ofmem_arch_unmap_pages(ucell virt, ucell size) { /* kill page mappings in provided range */ diff --git a/openbios-devel/arch/sparc64/ofmem_sparc64.c b/openbios-devel/arch/sparc64/ofmem_sparc64.c index 4d13038..0ec8632 100644 --- a/openbios-devel/arch/sparc64/ofmem_sparc64.c +++ b/openbios-devel/arch/sparc64/ofmem_sparc64.c @@ -63,6 +63,13 @@ ucell ofmem_arch_get_virt_top(void) return (ucell)TOP_OF_RAM; } +phys_addr_t ofmem_arch_get_phys_top(void) +{ + ofmem_t *ofmem = ofmem_arch_get_private(); + + return ofmem->ramsize; +} + retain_t *ofmem_arch_get_retained(void) { /* Retained area is at the top of physical RAM */ diff --git a/openbios-devel/include/libopenbios/ofmem.h b/openbios-devel/include/libopenbios/ofmem.h index 3d8ddbf..1e44d36 100644 --- a/openbios-devel/include/libopenbios/ofmem.h +++ b/openbios-devel/include/libopenbios/ofmem.h @@ -62,6 +62,7 @@ extern ofmem_t* ofmem_arch_get_private(void); extern void* ofmem_arch_get_malloc_base(void); extern ucell ofmem_arch_get_heap_top(void); extern ucell ofmem_arch_get_virt_top(void); +extern phys_addr_t ofmem_arch_get_phys_top(void); extern retain_t* ofmem_arch_get_retained(void); extern int ofmem_arch_get_physaddr_cellsize(void); extern int ofmem_arch_encode_physaddr(ucell *p, phys_addr_t value); diff --git a/openbios-devel/libopenbios/ofmem_common.c b/openbios-devel/libopenbios/ofmem_common.c index 638ca30..a7a0edf 100644 --- a/openbios-devel/libopenbios/ofmem_common.c +++ b/openbios-devel/libopenbios/ofmem_common.c @@ -354,7 +354,7 @@ static void ofmem_update_translations( void ) ofmem_t *ofmem = ofmem_arch_get_private(); ofmem_update_memory_available(s_phandle_memory, ofmem->phys_range, - &phys_range_prop, &phys_range_prop_size, &phys_range_prop_used, get_ram_size()); + &phys_range_prop, &phys_range_prop_size, &phys_range_prop_used, ofmem_arch_get_phys_top()); ofmem_update_memory_available(s_phandle_mmu, ofmem->virt_range, &virt_range_prop, &virt_range_prop_size, &virt_range_prop_used, -1ULL); ofmem_update_mmu_translations(); @@ -481,7 +481,7 @@ static ucell find_area( ucell align, ucell size, range_t *r, } static phys_addr_t ofmem_claim_phys_( phys_addr_t phys, ucell size, ucell align, - ucell min, ucell max, int reverse ) + phys_addr_t min, phys_addr_t max, int reverse ) { ofmem_t *ofmem = ofmem_arch_get_private(); if( !align ) { @@ -511,7 +511,7 @@ phys_addr_t ofmem_claim_phys( phys_addr_t phys, ucell size, ucell align ) " align=" FMT_ucellx "\n", phys, size, align); - return ofmem_claim_phys_( phys, size, align, 0, get_ram_size(), 0 ); + return ofmem_claim_phys_( phys, size, align, 0, ofmem_arch_get_phys_top(), 0 ); } static ucell ofmem_claim_virt_( ucell virt, ucell size, ucell align, @@ -591,7 +591,7 @@ ucell ofmem_claim( ucell addr, ucell size, ucell align ) } else { if( align < 0x1000 ) align = 0x1000; - phys = ofmem_claim_phys_( addr, size, align, 0, get_ram_size(), 1 /* reverse */ ); + 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 ) { OFMEM_TRACE("ofmem_claim failed\n"); -- 1.7.2.3

1 0

[PATCH 4/6] Alter ofmem_posix_memalign() so that the resulting pointer is aligned for both physical and virtual addresses.
by Mark Cave-Ayland 29 Dec '10

29 Dec '10

Some uses of ofmem_posix_memalign() need to ensure that the alignment requirement is for physical as well as virtual addresses, e.g. for MMU page tables. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> --- openbios-devel/libopenbios/ofmem_common.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/openbios-devel/libopenbios/ofmem_common.c b/openbios-devel/libopenbios/ofmem_common.c index 8fb9e5b..638ca30 100644 --- a/openbios-devel/libopenbios/ofmem_common.c +++ b/openbios-devel/libopenbios/ofmem_common.c @@ -33,9 +33,9 @@ static inline size_t align_size(size_t x, size_t a) return (x + a - 1) & ~(a - 1); } -static inline void * align_ptr(uintptr_t x, size_t a) +static inline phys_addr_t align_ptr(uintptr_t x, size_t a) { - return (void *)((x + a - 1) & ~(a - 1)); + return (x + a - 1) & ~(a - 1); } static ucell get_ram_size( void ) @@ -92,6 +92,7 @@ int ofmem_posix_memalign( void **memptr, int alignment, size_t size ) alloc_desc_t *d, **pp; void *ret; ucell top; + phys_addr_t pa; if( !size ) return ENOMEM; @@ -117,7 +118,11 @@ int ofmem_posix_memalign( void **memptr, int alignment, size_t size ) top = ofmem_arch_get_heap_top(); - ret = align_ptr((uintptr_t)ofmem->next_malloc + sizeof(alloc_desc_t), alignment); + /* Alignment should be on physical not virtual address */ + pa = va2pa((uintptr_t)ofmem->next_malloc + sizeof(alloc_desc_t)); + pa = align_ptr(pa, alignment); + ret = (void *)pa2va(pa); + if( pointer2cell(ret) + size > top ) { printk("out of malloc memory (%x)!\n", size ); return ENOMEM; -- 1.7.2.3

1 0

[PATCH 3/6] Introduce va2pa() and pa2va() functions for PPC for subsequent use by OFMEM.
by Mark Cave-Ayland 29 Dec '10

29 Dec '10

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> --- openbios-devel/arch/ppc/qemu/ofmem.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/openbios-devel/arch/ppc/qemu/ofmem.c b/openbios-devel/arch/ppc/qemu/ofmem.c index c21a112..44b5ef4 100644 --- a/openbios-devel/arch/ppc/qemu/ofmem.c +++ b/openbios-devel/arch/ppc/qemu/ofmem.c @@ -180,6 +180,27 @@ void ofmem_arch_create_translation_entry(ucell *transentry, translation_t *t) /* OF private allocations */ /************************************************************************/ +/* Private functions for mapping between physical/virtual addresses */ +inline phys_addr_t +va2pa(unsigned long va) +{ + if (va >= OF_CODE_START && va < OF_CODE_START + OF_CODE_SIZE) { + return (phys_addr_t)get_rom_base() - OF_CODE_START + va; + } else { + return (phys_addr_t)va; + } +} + +inline unsigned long +pa2va(phys_addr_t pa) +{ + if ((pa - get_rom_base() + OF_CODE_START >= OF_CODE_START) && + (pa - get_rom_base() + OF_CODE_START < OF_CODE_START + OF_CODE_SIZE)) + return (unsigned long)pa - get_rom_base() + OF_CODE_START; + else + return (unsigned long)pa; +} + void * malloc(int size) { -- 1.7.2.3

1 0

[PATCH 2/6] Introduce ofmem_posix_memalign() function for arbitrary alignment.
by Mark Cave-Ayland 29 Dec '10

29 Dec '10

Rework ofmem_malloc() so that it takes a parameter specifying the alignment for the allocation and then change the API to match that of posix_memalign(). Then create ofmem_malloc() as a simple wrapper function onto ofmem_posix_memalign() using a default alignment of CONFIG_OFMEM_MALLOC_ALIGN. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> --- openbios-devel/include/libopenbios/ofmem.h | 1 + openbios-devel/libopenbios/ofmem_common.c | 32 +++++++++++++++++++++------ 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/openbios-devel/include/libopenbios/ofmem.h b/openbios-devel/include/libopenbios/ofmem.h index 7b49e48..3d8ddbf 100644 --- a/openbios-devel/include/libopenbios/ofmem.h +++ b/openbios-devel/include/libopenbios/ofmem.h @@ -80,6 +80,7 @@ extern inline phys_addr_t va2pa(unsigned long va); extern inline unsigned long pa2va(phys_addr_t pa); /* malloc interface */ +extern int ofmem_posix_memalign( void **memptr, int alignment, size_t size ); extern void* ofmem_malloc( size_t size ); extern void ofmem_free( void *ptr ); extern void* ofmem_realloc( void *ptr, size_t size ); diff --git a/openbios-devel/libopenbios/ofmem_common.c b/openbios-devel/libopenbios/ofmem_common.c index bd0833f..8fb9e5b 100644 --- a/openbios-devel/libopenbios/ofmem_common.c +++ b/openbios-devel/libopenbios/ofmem_common.c @@ -86,7 +86,7 @@ print_trans( void ) /* OF private allocations */ /************************************************************************/ -void* ofmem_malloc( size_t size ) +int ofmem_posix_memalign( void **memptr, int alignment, size_t size ) { ofmem_t *ofmem = ofmem_arch_get_private(); alloc_desc_t *d, **pp; @@ -94,12 +94,12 @@ void* ofmem_malloc( size_t size ) ucell top; if( !size ) - return NULL; + return ENOMEM; if( !ofmem->next_malloc ) ofmem->next_malloc = (char*)ofmem_arch_get_malloc_base(); - size = align_size(size + sizeof(alloc_desc_t), CONFIG_OFMEM_MALLOC_ALIGN); + size = align_size(size + sizeof(alloc_desc_t), alignment); /* look in the freelist */ for( pp=&ofmem->mfree; *pp && (**pp).size < size; pp = &(**pp).next ) { @@ -110,15 +110,17 @@ void* ofmem_malloc( size_t size ) ret = (void *)((uintptr_t)*pp + sizeof(alloc_desc_t)); memset( ret, 0, (**pp).size - sizeof(alloc_desc_t) ); *pp = (**pp).next; - return ret; + + *memptr = ret; + return 0; } top = ofmem_arch_get_heap_top(); - ret = align_ptr((uintptr_t)ofmem->next_malloc + sizeof(alloc_desc_t), CONFIG_OFMEM_MALLOC_ALIGN); + ret = align_ptr((uintptr_t)ofmem->next_malloc + sizeof(alloc_desc_t), alignment); if( pointer2cell(ret) + size > top ) { printk("out of malloc memory (%x)!\n", size ); - return NULL; + return ENOMEM; } d = (alloc_desc_t*)((uintptr_t)ret - sizeof(alloc_desc_t)); @@ -129,7 +131,23 @@ void* ofmem_malloc( size_t size ) memset( ret, 0, size - sizeof(alloc_desc_t) ); - return ret; + *memptr = ret; + return 0; +} + +void* ofmem_malloc( size_t size ) +{ + void *memptr; + int res; + + res = ofmem_posix_memalign( &memptr, CONFIG_OFMEM_MALLOC_ALIGN, size ); + if (!res) { + /* Success */ + return memptr; + } else { + /* Failure */ + return NULL; + } } void ofmem_free( void *ptr ) -- 1.7.2.3

1 0

[PATCH 1/6] Fix alignment of memory allocated by OFMEM's ofmem_malloc().
by Mark Cave-Ayland 29 Dec '10

29 Dec '10

A casual glance at the source code suggests that pointers returned by ofmem_malloc() are aligned, but in fact they are not because sizeof(alloc_desc_t) is added to the final pointer return value. Create some additional padding after the previous value of ofmem->next_malloc so we can store the alloc_desc_t underneath the final return pointer in memory, thus ensuring that the final pointer is aligned correctly. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> --- openbios-devel/libopenbios/ofmem_common.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/openbios-devel/libopenbios/ofmem_common.c b/openbios-devel/libopenbios/ofmem_common.c index 20a4cba..bd0833f 100644 --- a/openbios-devel/libopenbios/ofmem_common.c +++ b/openbios-devel/libopenbios/ofmem_common.c @@ -28,9 +28,14 @@ //#define OFMEM_FILL_RANGE -static inline size_t ALIGN_SIZE(size_t x, size_t a) +static inline size_t align_size(size_t x, size_t a) { - return (x + a - 1) & ~(a-1); + return (x + a - 1) & ~(a - 1); +} + +static inline void * align_ptr(uintptr_t x, size_t a) +{ + return (void *)((x + a - 1) & ~(a - 1)); } static ucell get_ram_size( void ) @@ -85,7 +90,7 @@ void* ofmem_malloc( size_t size ) { ofmem_t *ofmem = ofmem_arch_get_private(); alloc_desc_t *d, **pp; - char *ret; + void *ret; ucell top; if( !size ) @@ -94,7 +99,7 @@ void* ofmem_malloc( size_t size ) if( !ofmem->next_malloc ) ofmem->next_malloc = (char*)ofmem_arch_get_malloc_base(); - size = ALIGN_SIZE(size + sizeof(alloc_desc_t), CONFIG_OFMEM_MALLOC_ALIGN); + size = align_size(size + sizeof(alloc_desc_t), CONFIG_OFMEM_MALLOC_ALIGN); /* look in the freelist */ for( pp=&ofmem->mfree; *pp && (**pp).size < size; pp = &(**pp).next ) { @@ -102,7 +107,7 @@ void* ofmem_malloc( size_t size ) /* waste at most 4K by taking an entry from the freelist */ if( *pp && (**pp).size < size + 0x1000 ) { - ret = (char*)*pp + sizeof(alloc_desc_t); + ret = (void *)((uintptr_t)*pp + sizeof(alloc_desc_t)); memset( ret, 0, (**pp).size - sizeof(alloc_desc_t) ); *pp = (**pp).next; return ret; @@ -110,18 +115,18 @@ void* ofmem_malloc( size_t size ) top = ofmem_arch_get_heap_top(); - if( pointer2cell(ofmem->next_malloc) + size > top ) { + ret = align_ptr((uintptr_t)ofmem->next_malloc + sizeof(alloc_desc_t), CONFIG_OFMEM_MALLOC_ALIGN); + if( pointer2cell(ret) + size > top ) { printk("out of malloc memory (%x)!\n", size ); return NULL; } - d = (alloc_desc_t*) ofmem->next_malloc; + d = (alloc_desc_t*)((uintptr_t)ret - sizeof(alloc_desc_t)); ofmem->next_malloc += size; d->next = NULL; d->size = size; - ret = (char*)d + sizeof(alloc_desc_t); memset( ret, 0, size - sizeof(alloc_desc_t) ); return ret; -- 1.7.2.3

1 0

[PATCH 0/6] Revised OFMEM patches in preparation for SPARC32 OFMEM patches v3
by Mark Cave-Ayland 29 Dec '10

29 Dec '10

Here are the OFMEM changes required in order to migrate SPARC32 over to OFMEM. v3: Rename ofmem_malloc_align() to ofmem_posix_memalign() and match with posix_memalign() API. v2: Revised based upon mailing list comments. v1: Initial implementation. Mark Cave-Ayland (6): Fix alignment of memory allocated by OFMEM's ofmem_malloc(). Introduce ofmem_posix_memalign() function for arbitrary alignment. Introduce va2pa() and pa2va() functions for PPC for subsequent use by OFMEM. Alter ofmem_posix_memalign() so that the resulting pointer is aligned for both physical and virtual addresses. Introduce ofmem_arch_get_phys_top() for specifying the top of physical memory in OFMEM. Change OFMEM to allocate memory from the top of RAM downwards. openbios-devel/arch/ppc/qemu/ofmem.c | 28 ++++++++++++ openbios-devel/arch/sparc64/ofmem_sparc64.c | 7 +++ openbios-devel/include/libopenbios/ofmem.h | 2 + openbios-devel/libopenbios/ofmem_common.c | 64 +++++++++++++++++++-------- 4 files changed, 83 insertions(+), 18 deletions(-) -- 1.7.2.3

1 0

Revised OFMEM patches in preparation for SPARC32 OFMEM patches v2
by Mark Cave-Ayland 29 Dec '10

29 Dec '10

Based upon feedback, I've revised this patchset and will resend it to the list shortly. ATB, Mark. -- Mark Cave-Ayland - Senior Technical Architect PostgreSQL - PostGIS Sirius Corporation plc - control through freedom http://www.siriusit.co.uk t: +44 870 608 0063 Sirius Labs: http://www.siriusit.co.uk/labs

1 0

[PATCH 1/5] Fix alignment of memory allocated by OFMEM's ofmem_malloc().
by Mark Cave-Ayland 28 Dec '10

28 Dec '10

A casual glance at the source code suggests that pointers returned by ofmem_malloc() are aligned, but in fact they are not because sizeof(alloc_desc_t) is added to the final pointer return value. Create some additional padding after the previous value of ofmem->next_malloc so we can store the alloc_desc_t underneath the final return pointer in memory, thus ensuring that the final pointer is aligned correctly. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> --- openbios-devel/libopenbios/ofmem_common.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/openbios-devel/libopenbios/ofmem_common.c b/openbios-devel/libopenbios/ofmem_common.c index 20a4cba..a4e199c 100644 --- a/openbios-devel/libopenbios/ofmem_common.c +++ b/openbios-devel/libopenbios/ofmem_common.c @@ -33,6 +33,11 @@ static inline size_t ALIGN_SIZE(size_t x, size_t a) return (x + a - 1) & ~(a-1); } +static inline void * ALIGN_PTR(uintptr_t x, size_t a) +{ + return (void *)((x + a - 1) & ~(a-1)); +} + static ucell get_ram_size( void ) { ofmem_t *ofmem = ofmem_arch_get_private(); @@ -102,29 +107,29 @@ void* ofmem_malloc( size_t size ) /* waste at most 4K by taking an entry from the freelist */ if( *pp && (**pp).size < size + 0x1000 ) { - ret = (char*)*pp + sizeof(alloc_desc_t); - memset( ret, 0, (**pp).size - sizeof(alloc_desc_t) ); + ret = (char *)((uintptr_t)*pp + sizeof(alloc_desc_t)); + memset( (char *)ret, 0, (**pp).size - sizeof(alloc_desc_t) ); *pp = (**pp).next; - return ret; + return (void *)ret; } top = ofmem_arch_get_heap_top(); - if( pointer2cell(ofmem->next_malloc) + size > top ) { + ret = (char *)ALIGN_PTR((uintptr_t)ofmem->next_malloc + sizeof(alloc_desc_t), CONFIG_OFMEM_MALLOC_ALIGN); + if( pointer2cell((void *)ret) + size > top ) { printk("out of malloc memory (%x)!\n", size ); return NULL; } - d = (alloc_desc_t*) ofmem->next_malloc; + d = (alloc_desc_t*)((uintptr_t)ret - sizeof(alloc_desc_t)); ofmem->next_malloc += size; d->next = NULL; d->size = size; - ret = (char*)d + sizeof(alloc_desc_t); - memset( ret, 0, size - sizeof(alloc_desc_t) ); + memset( (char *)ret, 0, size - sizeof(alloc_desc_t) ); - return ret; + return (void *)ret; } void ofmem_free( void *ptr ) -- 1.7.1

4 22

[PATCH 1/4] ppc: Prepare more assembler macros for ppc64 compatibility
by Andreas Färber 24 Dec '10

24 Dec '10

Adopt macro names from Linux. Cc: Alexander Graf <agraf(a)suse.de> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> --- include/arch/ppc/asmdefs.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/include/arch/ppc/asmdefs.h b/include/arch/ppc/asmdefs.h index 05a89b2..e20e8ee 100644 --- a/include/arch/ppc/asmdefs.h +++ b/include/arch/ppc/asmdefs.h @@ -100,13 +100,21 @@ #endif #ifdef __powerpc64__ +#define PPC_LL ld +#define PPC_STL std +#define PPC_STLU stdu #define RFI rfid #define MTMSRD(r) mtmsrd r #define BRANCH_LABEL(name) . ## name +#define PPC_LR_STKOFF 16 #else +#define PPC_LL lwz +#define PPC_STL stw +#define PPC_STLU stwu #define RFI rfi #define MTMSRD(r) mtmsr r #define BRANCH_LABEL(name) name +#define PPC_LR_STKOFF 4 #endif #ifndef __darwin__ -- 1.7.3

2 15

[commit] r988 - trunk/openbios-devel/arch/ppc/qemu
by repository service 24 Dec '10

24 Dec '10

Author: afaerber Date: Fri Dec 24 23:36:33 2010 New Revision: 988 URL: http://tracker.coreboot.org/trac/openbios/changeset/988 Log: ppc64: Set up TOC pointer for of_client_interface() Avoids 'unpredictable' memory accesses there. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/arch/ppc/qemu/start.S Modified: trunk/openbios-devel/arch/ppc/qemu/start.S ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/start.S Fri Dec 24 23:33:34 2010 (r987) +++ trunk/openbios-devel/arch/ppc/qemu/start.S Fri Dec 24 23:36:33 2010 (r988) @@ -578,6 +578,10 @@ PPC_STL r30, (STKOFF + 31 * ULONG_SIZE)(r1) PPC_STL r31, (STKOFF + 32 * ULONG_SIZE)(r1) +#ifdef CONFIG_PPC64 + LOAD_REG_IMMEDIATE(r2, of_client_interface) + ld r2, 8(r2) +#endif bl BRANCH_LABEL(of_client_interface) /* restore r5 - r31 */

1 0

[commit] r987 - in trunk/openbios-devel: arch/ppc/qemu include/arch/ppc
by repository service 24 Dec '10

24 Dec '10

Author: afaerber Date: Fri Dec 24 23:33:34 2010 New Revision: 987 URL: http://tracker.coreboot.org/trac/openbios/changeset/987 Log: ppc: Adjust call_elf() and CIF prologues and epilogues for ppc64 Respect differing register widths and stack frame ABI differences. Fix of_client_callback stack alignment for both ppc and ppc64. v3: * Introduced DATA_LONG() macro, suggested by Alex. Cc: Alexander Graf <agraf(a)suse.de> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/arch/ppc/qemu/start.S trunk/openbios-devel/include/arch/ppc/asmdefs.h Modified: trunk/openbios-devel/arch/ppc/qemu/start.S ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/start.S Sun Dec 19 14:37:43 2010 (r986) +++ trunk/openbios-devel/arch/ppc/qemu/start.S Fri Dec 24 23:33:34 2010 (r987) @@ -179,6 +179,9 @@ #undef stl #undef ll +#define ULONG_SIZE 4 +#define STACKFRAME_MINSIZE 16 + #else /* !CONFIG_PPC_64BITSUPPORT */ #ifdef __powerpc64__ @@ -471,16 +474,16 @@ */ .data saved_stack: - .long 0 + DATA_LONG(0) .previous /* void call_elf( arg1, arg2, entry ) */ _GLOBAL(call_elf): mflr r0 - stwu r1,-16(r1) - stw r0,20(r1) + PPC_STLU r1, -STACKFRAME_MINSIZE(r1) + PPC_STL r0, (STACKFRAME_MINSIZE + PPC_LR_STKOFF)(r1) mtlr r5 LOAD_REG_IMMEDIATE(r8, saved_stack) // save our stack pointer - stw r1,0(r8) + PPC_STL r1,0(r8) mfsdr1 r1 addi r1, r1, -32768 /* - 32 KiB exception stack */ addis r1, r1, -1 /* - 64 KiB stack */ @@ -488,137 +491,147 @@ li r6,0 // r6 = address of client program arguments (unused) li r7,0 // r7 = length of client program arguments (unused) li r0,MSR_FP | MSR_ME | MSR_DR | MSR_IR - mtmsr r0 + MTMSRD(r0) blrl LOAD_REG_IMMEDIATE(r8, saved_stack) // restore stack pointer mr r1,r8 - lwz r0,20(r1) + PPC_LL r0, (STACKFRAME_MINSIZE + PPC_LR_STKOFF)(r1) mtlr r0 - addi r1,r1,16 + addi r1, r1, STACKFRAME_MINSIZE // XXX: should restore r12-r31 etc.. // we should not really come here though blr -#define SAVE_SPACE 140 +#ifdef __powerpc64__ +#define STKOFF STACKFRAME_MINSIZE +#define SAVE_SPACE 320 +#else +#define STKOFF 8 +#define SAVE_SPACE 144 +#endif GLOBL(of_client_callback): - stwu r1, -12(r1) +#ifdef CONFIG_PPC64 + PPC_STLU r1, -(STACKFRAME_MINSIZE + 16)(r1) +#else + PPC_STLU r1, -STACKFRAME_MINSIZE(r1) /* fits within alignment */ +#endif /* save r4 */ - stw r4, 8(r1) + PPC_STL r4, STKOFF(r1) /* save lr */ mflr r4 - stw r4, 4(r1) + PPC_STL r4, PPC_LR_STKOFF(r1) /* restore OF stack */ LOAD_REG_IMMEDIATE(r4, saved_stack) - lwz r4,0(r4) + PPC_LL r4, 0(r4) - stwu r4,-SAVE_SPACE(r4) - stw r1,8(r4) // save caller stack + PPC_STLU r4,-SAVE_SPACE(r4) + PPC_STL r1,(STKOFF)(r4) // save caller stack mr r1,r4 - stw r2,12(r1) - stw r0,16(r1) + PPC_STL r2, (STKOFF + 1 * ULONG_SIZE)(r1) + PPC_STL r0, (STKOFF + 2 * ULONG_SIZE)(r1) /* save ctr, cr and xer */ mfctr r2 - stw r2,20(r1) + PPC_STL r2, (STKOFF + 3 * ULONG_SIZE)(r1) mfcr r2 - stw r2,24(r1) + PPC_STL r2, (STKOFF + 4 * ULONG_SIZE)(r1) mfxer r2 - stw r2,28(r1) + PPC_STL r2, (STKOFF + 5 * ULONG_SIZE)(r1) /* save r5 - r31 */ - stw r5, 32(r1) - stw r6,36(r1) - stw r7,40(r1) - stw r8,44(r1) - stw r9,48(r1) - stw r10,52(r1) - stw r11,56(r1) - stw r12,60(r1) - stw r13,64(r1) - stw r14,68(r1) - stw r15,72(r1) - stw r16,76(r1) - stw r17,80(r1) - stw r18,84(r1) - stw r19,88(r1) - stw r20,92(r1) - stw r21,96(r1) - stw r22,100(r1) - stw r23,104(r1) - stw r24,108(r1) - stw r25,112(r1) - stw r26,116(r1) - stw r27,120(r1) - stw r28,124(r1) - stw r29,128(r1) - stw r30,132(r1) - stw r31,136(r1) + PPC_STL r5, (STKOFF + 6 * ULONG_SIZE)(r1) + PPC_STL r6, (STKOFF + 7 * ULONG_SIZE)(r1) + PPC_STL r7, (STKOFF + 8 * ULONG_SIZE)(r1) + PPC_STL r8, (STKOFF + 9 * ULONG_SIZE)(r1) + PPC_STL r9, (STKOFF + 10 * ULONG_SIZE)(r1) + PPC_STL r10, (STKOFF + 11 * ULONG_SIZE)(r1) + PPC_STL r11, (STKOFF + 12 * ULONG_SIZE)(r1) + PPC_STL r12, (STKOFF + 13 * ULONG_SIZE)(r1) + PPC_STL r13, (STKOFF + 14 * ULONG_SIZE)(r1) + PPC_STL r14, (STKOFF + 15 * ULONG_SIZE)(r1) + PPC_STL r15, (STKOFF + 16 * ULONG_SIZE)(r1) + PPC_STL r16, (STKOFF + 17 * ULONG_SIZE)(r1) + PPC_STL r17, (STKOFF + 18 * ULONG_SIZE)(r1) + PPC_STL r18, (STKOFF + 19 * ULONG_SIZE)(r1) + PPC_STL r19, (STKOFF + 20 * ULONG_SIZE)(r1) + PPC_STL r20, (STKOFF + 21 * ULONG_SIZE)(r1) + PPC_STL r21, (STKOFF + 22 * ULONG_SIZE)(r1) + PPC_STL r22, (STKOFF + 23 * ULONG_SIZE)(r1) + PPC_STL r23, (STKOFF + 24 * ULONG_SIZE)(r1) + PPC_STL r24, (STKOFF + 25 * ULONG_SIZE)(r1) + PPC_STL r25, (STKOFF + 26 * ULONG_SIZE)(r1) + PPC_STL r26, (STKOFF + 27 * ULONG_SIZE)(r1) + PPC_STL r27, (STKOFF + 28 * ULONG_SIZE)(r1) + PPC_STL r28, (STKOFF + 29 * ULONG_SIZE)(r1) + PPC_STL r29, (STKOFF + 30 * ULONG_SIZE)(r1) + PPC_STL r30, (STKOFF + 31 * ULONG_SIZE)(r1) + PPC_STL r31, (STKOFF + 32 * ULONG_SIZE)(r1) - bl of_client_interface + bl BRANCH_LABEL(of_client_interface) /* restore r5 - r31 */ - lwz r5,32(r1) - lwz r6,36(r1) - lwz r7,40(r1) - lwz r8,44(r1) - lwz r9,48(r1) - lwz r10,52(r1) - lwz r11,56(r1) - lwz r12,60(r1) - lwz r13,64(r1) - lwz r14,68(r1) - lwz r15,72(r1) - lwz r16,76(r1) - lwz r17,80(r1) - lwz r18,84(r1) - lwz r19,88(r1) - lwz r20,92(r1) - lwz r21,96(r1) - lwz r22,100(r1) - lwz r23,104(r1) - lwz r24,108(r1) - lwz r25,112(r1) - lwz r26,116(r1) - lwz r27,120(r1) - lwz r28,124(r1) - lwz r29,128(r1) - lwz r30,132(r1) - lwz r31,136(r1) + PPC_LL r5, (STKOFF + 6 * ULONG_SIZE)(r1) + PPC_LL r6, (STKOFF + 7 * ULONG_SIZE)(r1) + PPC_LL r7, (STKOFF + 8 * ULONG_SIZE)(r1) + PPC_LL r8, (STKOFF + 9 * ULONG_SIZE)(r1) + PPC_LL r9, (STKOFF + 10 * ULONG_SIZE)(r1) + PPC_LL r10, (STKOFF + 11 * ULONG_SIZE)(r1) + PPC_LL r11, (STKOFF + 12 * ULONG_SIZE)(r1) + PPC_LL r12, (STKOFF + 13 * ULONG_SIZE)(r1) + PPC_LL r13, (STKOFF + 14 * ULONG_SIZE)(r1) + PPC_LL r14, (STKOFF + 15 * ULONG_SIZE)(r1) + PPC_LL r15, (STKOFF + 16 * ULONG_SIZE)(r1) + PPC_LL r16, (STKOFF + 17 * ULONG_SIZE)(r1) + PPC_LL r17, (STKOFF + 18 * ULONG_SIZE)(r1) + PPC_LL r18, (STKOFF + 19 * ULONG_SIZE)(r1) + PPC_LL r19, (STKOFF + 20 * ULONG_SIZE)(r1) + PPC_LL r20, (STKOFF + 21 * ULONG_SIZE)(r1) + PPC_LL r21, (STKOFF + 22 * ULONG_SIZE)(r1) + PPC_LL r22, (STKOFF + 23 * ULONG_SIZE)(r1) + PPC_LL r23, (STKOFF + 24 * ULONG_SIZE)(r1) + PPC_LL r24, (STKOFF + 25 * ULONG_SIZE)(r1) + PPC_LL r25, (STKOFF + 26 * ULONG_SIZE)(r1) + PPC_LL r26, (STKOFF + 27 * ULONG_SIZE)(r1) + PPC_LL r27, (STKOFF + 28 * ULONG_SIZE)(r1) + PPC_LL r28, (STKOFF + 29 * ULONG_SIZE)(r1) + PPC_LL r29, (STKOFF + 30 * ULONG_SIZE)(r1) + PPC_LL r30, (STKOFF + 31 * ULONG_SIZE)(r1) + PPC_LL r31, (STKOFF + 32 * ULONG_SIZE)(r1) /* restore ctr, cr and xer */ - lwz r2,20(r1) + PPC_LL r2, (STKOFF + 3 * ULONG_SIZE)(r1) mtctr r2 - lwz r2,24(r1) + PPC_LL r2, (STKOFF + 4 * ULONG_SIZE)(r1) mtcr r2 - lwz r2,28(r1) + PPC_LL r2, (STKOFF + 5 * ULONG_SIZE)(r1) mtxer r2 /* restore r0 and r2 */ - lwz r2,12(r1) - lwz r0,16(r1) + PPC_LL r2, (STKOFF + 1 * ULONG_SIZE)(r1) + PPC_LL r0, (STKOFF + 2 * ULONG_SIZE)(r1) /* restore caller stack */ - lwz r1,8(r1) + PPC_LL r1, (STKOFF)(r1) - lwz r4, 4(r1) + PPC_LL r4, PPC_LR_STKOFF(r1) mtlr r4 - lwz r4, 8(r1) - lwz r1, 0(r1) + PPC_LL r4, STKOFF(r1) + PPC_LL r1, 0(r1) blr Modified: trunk/openbios-devel/include/arch/ppc/asmdefs.h ============================================================================== --- trunk/openbios-devel/include/arch/ppc/asmdefs.h Sun Dec 19 14:37:43 2010 (r986) +++ trunk/openbios-devel/include/arch/ppc/asmdefs.h Fri Dec 24 23:33:34 2010 (r987) @@ -105,6 +105,7 @@ #define PPC_STLU stdu #define RFI rfid #define MTMSRD(r) mtmsrd r +#define DATA_LONG(x) .quad x #define BRANCH_LABEL(name) . ## name #define PPC_LR_STKOFF 16 #else @@ -113,6 +114,7 @@ #define PPC_STLU stwu #define RFI rfi #define MTMSRD(r) mtmsr r +#define DATA_LONG(x) .long x #define BRANCH_LABEL(name) name #define PPC_LR_STKOFF 4 #endif

1 0

Bug in ESP DMA implementation?
by Mark Cave-Ayland 22 Dec '10

22 Dec '10

Hi all, Continuing more with my work on migrating SPARC32 to OFMEM, I've hit an issue with the ESP driver which is causing me a bit of a problem. At the moment, I have a hybrid old-mem/OFMEM SPARC32 setup where I am migrating the various memory calls over to OFMEM one at a time. Currently my implementation just uses OFMEM for allocating MMU page tables, and with the default compile option of -Os looks like this: Configuration device id QEMU version 1 machine id 32 Unhandled Exception 0x0000001f PC = 0xffd12f08 NPC = 0xffd12f0c Stopping execution The interesting part is that this problem goes away if I compile with any -O3 or -O0 or but shows when I compile with -O2, -O1 or -Os. So I wonder if I've hit some kind of logic bug in OpenBIOS? Looking at the SPARCv8 specification, exception 0x1f is equivalent to IRQ15 and the offending code where the error occurs can be found in drivers/esp.c:do_command(): esp->ll->regs[ESP_BUSID] = sd->id & 7; // Set DMA address esp->espdma.regs->st_addr = esp->buffer_dvma; // Set DMA length esp->ll->regs[ESP_TCLOW] = cmdlen & 0xff; esp->ll->regs[ESP_TCMED] = (cmdlen >> 8) & 0xff; // Set DMA direction and enable DMA esp->espdma.regs->cond_reg = DMA_ENABLE; /* Crash occurs somewhere in this section... */ // Set ATN, issue command esp->ll->regs[ESP_CMD] = ESP_CMD_SELA | ESP_CMD_DMA; // Wait for DMA to complete. Can this fail? while ((esp->espdma.regs->cond_reg & DMA_HNDL_INTR) == 0) /* End of crash section */; // Check status status = esp->ll->regs[ESP_STATUS]; // Clear interrupts to avoid guests seeing spurious interrupts (void)esp->ll->regs[ESP_INTRPT]; I notice from the code above there is an explicit comment that mentions clearing interrupts to prevent the guest from seeing them so I would have thought that this wouldn't be an issue? I've checked the espdma structures to ensure that they are marked volatile (or _volatile_) and this appears to be the case - so I'm a little bit stumped. Can anyone point me in the right direction or spot the mistake? ATB, Mark. -- Mark Cave-Ayland - Senior Technical Architect PostgreSQL - PostGIS Sirius Corporation plc - control through freedom http://www.siriusit.co.uk t: +44 870 608 0063 Sirius Labs: http://www.siriusit.co.uk/labs

2 4

[RFC] libopenbios: Adapt CIF handling for ppc64
by Andreas Färber 20 Dec '10

20 Dec '10

On ppc64 neither long nor pointers can be used for the client interface. Introduce new types prom_[u]arg_t to abstract this and add helpers get_service() and arg2pointer() as well as format strings. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> --- libopenbios/client.c | 302 ++++++++++++++++++++++++++++---------------------- 1 files changed, 170 insertions(+), 132 deletions(-) diff --git a/libopenbios/client.c b/libopenbios/client.c index d8a9fdf..d986226 100644 --- a/libopenbios/client.c +++ b/libopenbios/client.c @@ -30,13 +30,47 @@ * (it doesn't) or if the function is unimplemented. */ +#ifdef CONFIG_PPC64 +typedef int prom_arg_t; +typedef unsigned int prom_uarg_t; +#define PRIdARG "d" +#define PRIxARG "x" +#define FMT_arg "%" PRIdARG +#define FMT_argx "%08" PRIxARG +#else +typedef long prom_arg_t; +typedef unsigned long prom_uarg_t; +#define PRIdARG "ld" +#define PRIxARG "lx" +#define FMT_arg "%" PRIdARG +#define FMT_argx "%08" PRIxARG +#endif + #define PROM_MAX_ARGS 10 typedef struct prom_args { - const char *service; - long nargs; - long nret; - unsigned long args[PROM_MAX_ARGS]; -} prom_args_t; +#ifdef CONFIG_PPC64 + prom_uarg_t service; +#else + const char *service; +#endif + prom_arg_t nargs; + prom_arg_t nret; + prom_uarg_t args[PROM_MAX_ARGS]; +} __attribute__((packed)) prom_args_t; + +static inline void* arg2pointer(prom_uarg_t value) +{ + return (void*)(uintptr_t)value; +} + +static inline const char* get_service(prom_args_t *pb) +{ +#ifdef CONFIG_PPC64 + return arg2pointer(pb->service); +#else + return pb->service; +#endif +} #ifdef DEBUG_CIF static void memdump(const char *mem, unsigned long size) @@ -73,83 +107,84 @@ static void memdump(const char *mem, unsigned long size) static void dump_service(prom_args_t *pb) { int i; - if (strcmp(pb->service, "test") == 0) { - printk("test(\"%s\") = ", (char*)pb->args[0]); - } else if (strcmp(pb->service, "peer") == 0) { - printk("peer(0x%08lx) = ", pb->args[0]); - } else if (strcmp(pb->service, "child") == 0) { - printk("child(0x%08lx) = ", pb->args[0]); - } else if (strcmp(pb->service, "parent") == 0) { - printk("parent(0x%08lx) = ", pb->args[0]); - } else if (strcmp(pb->service, "instance-to-package") == 0) { - printk("instance-to-package(0x%08lx) = ", pb->args[0]); - } else if (strcmp(pb->service, "getproplen") == 0) { - printk("getproplen(0x%08lx, \"%s\") = ", - pb->args[0], (char*)pb->args[1]); - } else if (strcmp(pb->service, "getprop") == 0) { - printk("getprop(0x%08lx, \"%s\", 0x%08lx, %ld) = ", - pb->args[0], (char*)pb->args[1], + const char *service = get_service(pb); + if (strcmp(service, "test") == 0) { + printk("test(\"%s\") = ", (char*)arg2pointer(pb->args[0])); + } else if (strcmp(service, "peer") == 0) { + printk("peer(0x" FMT_argx ") = ", pb->args[0]); + } else if (strcmp(service, "child") == 0) { + printk("child(0x" FMT_argx ") = ", pb->args[0]); + } else if (strcmp(service, "parent") == 0) { + printk("parent(0x" FMT_argx ") = ", pb->args[0]); + } else if (strcmp(service, "instance-to-package") == 0) { + printk("instance-to-package(0x" FMT_argx ") = ", pb->args[0]); + } else if (strcmp(service, "getproplen") == 0) { + printk("getproplen(0x" FMT_argx ", \"%s\") = ", + pb->args[0], (char*)arg2pointer(pb->args[1])); + } else if (strcmp(service, "getprop") == 0) { + printk("getprop(0x" FMT_argx ", \"%s\", 0x" FMT_argx ", " FMT_arg ") = ", + pb->args[0], (char*)arg2pointer(pb->args[1]), pb->args[2], pb->args[3]); - } else if (strcmp(pb->service, "nextprop") == 0) { - printk("nextprop(0x%08lx, \"%s\", 0x%08lx) = ", - pb->args[0], (char*)pb->args[1], pb->args[2]); - } else if (strcmp(pb->service, "setprop") == 0) { - printk("setprop(0x%08lx, \"%s\", 0x%08lx, %ld)\n", - pb->args[0], (char*)pb->args[1], + } else if (strcmp(service, "nextprop") == 0) { + printk("nextprop(0x" FMT_argx ", \"%s\", 0x" FMT_argx ") = ", + pb->args[0], (char*)arg2pointer(pb->args[1]), pb->args[2]); + } else if (strcmp(service, "setprop") == 0) { + printk("setprop(0x" FMT_argx ", \"%s\", 0x" FMT_argx ", " FMT_arg ")\n", + pb->args[0], (char*)arg2pointer(pb->args[1]), pb->args[2], pb->args[3]); - memdump((char*)pb->args[2], pb->args[3]); + memdump((char*)arg2pointer(pb->args[2]), pb->args[3]); printk(" = "); - } else if (strcmp(pb->service, "canon") == 0) { - printk("canon(\"%s\", 0x%08lx, %ld)\n", - (char*)pb->args[0], pb->args[1], pb->args[2]); - } else if (strcmp(pb->service, "finddevice") == 0) { - printk("finddevice(\"%s\") = ", (char*)pb->args[0]); - } else if (strcmp(pb->service, "instance-to-path") == 0) { - printk("instance-to-path(0x%08lx, 0x%08lx, %ld) = ", + } else if (strcmp(service, "canon") == 0) { + printk("canon(\"%s\", 0x" FMT_argx ", " FMT_arg ")\n", + (char*)arg2pointer(pb->args[0]), pb->args[1], pb->args[2]); + } else if (strcmp(service, "finddevice") == 0) { + printk("finddevice(\"%s\") = ", (char*)arg2pointer(pb->args[0])); + } else if (strcmp(service, "instance-to-path") == 0) { + printk("instance-to-path(0x" FMT_argx ", 0x" FMT_argx ", " FMT_arg ") = ", pb->args[0], pb->args[1], pb->args[2]); - } else if (strcmp(pb->service, "package-to-path") == 0) { - printk("package-to-path(0x%08lx, 0x%08lx, %ld) = ", + } else if (strcmp(service, "package-to-path") == 0) { + printk("package-to-path(0x" FMT_argx ", 0x" FMT_argx ", " FMT_arg ") = ", pb->args[0], pb->args[1], pb->args[2]); - } else if (strcmp(pb->service, "open") == 0) { - printk("open(\"%s\") = ", (char*)pb->args[0]); - } else if (strcmp(pb->service, "close") == 0) { - printk("close(0x%08lx)\n", pb->args[0]); - } else if (strcmp(pb->service, "read") == 0) { + } else if (strcmp(service, "open") == 0) { + printk("open(\"%s\") = ", (char*)arg2pointer(pb->args[0])); + } else if (strcmp(service, "close") == 0) { + printk("close(0x" FMT_argx ")\n", pb->args[0]); + } else if (strcmp(service, "read") == 0) { #ifdef DUMP_IO - printk("read(0x%08lx, 0x%08lx, %ld) = ", + printk("read(0x" FMT_argx ", 0x" FMT_argx ", " FMT_arg ") = ", pb->args[0], pb->args[1], pb->args[2]); #endif - } else if (strcmp(pb->service, "write") == 0) { + } else if (strcmp(service, "write") == 0) { #ifdef DUMP_IO - printk("write(0x%08lx, 0x%08lx, %ld)\n", + printk("write(0x" FMT_argx ", 0x" FMT_argx ", " FMT_arg ")\n", pb->args[0], pb->args[1], pb->args[2]); - memdump((char*)pb->args[1], pb->args[2]); + memdump((char*)arg2pointer(pb->args[1]), pb->args[2]); printk(" = "); #endif - } else if (strcmp(pb->service, "seek") == 0) { + } else if (strcmp(service, "seek") == 0) { #ifdef DUMP_IO - printk("seek(0x%08lx, 0x%08lx, 0x%08lx) = ", + printk("seek(0x" FMT_argx ", 0x" FMT_argx ", 0x" FMT_argx ") = ", pb->args[0], pb->args[1], pb->args[2]); #endif - } else if (strcmp(pb->service, "claim") == 0) { - printk("claim(0x%08lx, %ld, %ld) = ", + } else if (strcmp(service, "claim") == 0) { + printk("claim(0x" FMT_argx ", " FMT_arg ", " FMT_arg ") = ", pb->args[0], pb->args[1], pb->args[2]); - } else if (strcmp(pb->service, "release") == 0) { - printk("release(0x%08lx, %ld)\n", + } else if (strcmp(service, "release") == 0) { + printk("release(0x" FMT_argx ", " FMT_arg ")\n", pb->args[0], pb->args[1]); - } else if (strcmp(pb->service, "boot") == 0) { - printk("boot \"%s\"\n", (char*)pb->args[0]); - } else if (strcmp(pb->service, "enter") == 0) { + } else if (strcmp(service, "boot") == 0) { + printk("boot \"%s\"\n", (char*)arg2pointer(pb->args[0])); + } else if (strcmp(service, "enter") == 0) { printk("enter()\n"); - } else if (strcmp(pb->service, "exit") == 0) { + } else if (strcmp(service, "exit") == 0) { printk("exit()\n"); - } else if (strcmp(pb->service, "test-method") == 0) { - printk("test-method(0x%08lx, \"%s\") = ", - pb->args[0], (char*)pb->args[1]); + } else if (strcmp(service, "test-method") == 0) { + printk("test-method(0x" FMT_argx ", \"%s\") = ", + pb->args[0], (char*)arg2pointer(pb->args[1])); } else { - printk("of_client_interface: %s ", pb->service ); + printk("of_client_interface: %s", service); for( i = 0; i < pb->nargs; i++ ) - printk("%lx ", pb->args[i] ); + printk(" %" PRIxARG, pb->args[i]); printk("\n"); } } @@ -157,71 +192,72 @@ static void dump_service(prom_args_t *pb) static void dump_return(prom_args_t *pb) { int i; - if (strcmp(pb->service, "test") == 0) { - printk(" %ld\n", pb->args[pb->nargs]); - } else if (strcmp(pb->service, "peer") == 0) { - printk("0x%08lx\n", pb->args[pb->nargs]); - } else if (strcmp(pb->service, "child") == 0) { - printk("0x%08lx\n", pb->args[pb->nargs]); - } else if (strcmp(pb->service, "parent") == 0) { - printk("0x%08lx\n", pb->args[pb->nargs]); - } else if (strcmp(pb->service, "instance-to-package") == 0) { - printk("0x%08lx\n", pb->args[pb->nargs]); - } else if (strcmp(pb->service, "getproplen") == 0) { - printk("0x%08lx\n", pb->args[pb->nargs]); - } else if (strcmp(pb->service, "getprop") == 0) { - printk("%ld\n", pb->args[pb->nargs]); - if ((long)pb->args[pb->nargs] != -1) - memdump((char*)pb->args[2], MIN(pb->args[3], pb->args[pb->nargs])); - } else if (strcmp(pb->service, "nextprop") == 0) { - printk("%ld\n", pb->args[pb->nargs]); - memdump((char*)pb->args[2], pb->args[pb->nargs]); - } else if (strcmp(pb->service, "setprop") == 0) { - printk("%ld\n", pb->args[pb->nargs]); - } else if (strcmp(pb->service, "canon") == 0) { - printk("%ld\n", pb->args[pb->nargs]); - memdump((char*)pb->args[1], pb->args[pb->nargs]); - } else if (strcmp(pb->service, "finddevice") == 0) { - printk("0x%08lx\n", pb->args[pb->nargs]); - } else if (strcmp(pb->service, "instance-to-path") == 0) { - printk("%ld\n", pb->args[pb->nargs]); - memdump((char*)pb->args[1], pb->args[pb->nargs]); - } else if (strcmp(pb->service, "package-to-path") == 0) { - printk("%ld\n", pb->args[pb->nargs]); - memdump((char*)pb->args[1], pb->args[pb->nargs]); - } else if (strcmp(pb->service, "open") == 0) { - printk("0x%08lx\n", pb->args[pb->nargs]); - } else if (strcmp(pb->service, "close") == 0) { + const char *service = get_service(pb); + if (strcmp(service, "test") == 0) { + printk(FMT_arg "\n", pb->args[pb->nargs]); + } else if (strcmp(service, "peer") == 0) { + printk("0x" FMT_argx "\n", pb->args[pb->nargs]); + } else if (strcmp(service, "child") == 0) { + printk("0x" FMT_argx "\n", pb->args[pb->nargs]); + } else if (strcmp(service, "parent") == 0) { + printk("0x" FMT_argx "\n", pb->args[pb->nargs]); + } else if (strcmp(service, "instance-to-package") == 0) { + printk("0x" FMT_argx "\n", pb->args[pb->nargs]); + } else if (strcmp(service, "getproplen") == 0) { + printk("0x" FMT_argx "\n", pb->args[pb->nargs]); + } else if (strcmp(service, "getprop") == 0) { + printk(FMT_arg "\n", pb->args[pb->nargs]); + if ((prom_arg_t)pb->args[pb->nargs] != -1) + memdump((char*)arg2pointer(pb->args[2]), MIN(pb->args[3], pb->args[pb->nargs])); + } else if (strcmp(service, "nextprop") == 0) { + printk(FMT_arg "\n", pb->args[pb->nargs]); + memdump((char*)arg2pointer(pb->args[2]), pb->args[pb->nargs]); + } else if (strcmp(service, "setprop") == 0) { + printk(FMT_arg "\n", pb->args[pb->nargs]); + } else if (strcmp(service, "canon") == 0) { + printk(FMT_arg "\n", pb->args[pb->nargs]); + memdump((char*)arg2pointer(pb->args[1]), pb->args[pb->nargs]); + } else if (strcmp(service, "finddevice") == 0) { + printk("0x" FMT_argx "\n", pb->args[pb->nargs]); + } else if (strcmp(service, "instance-to-path") == 0) { + printk(FMT_arg "\n", pb->args[pb->nargs]); + memdump((char*)arg2pointer(pb->args[1]), pb->args[pb->nargs]); + } else if (strcmp(service, "package-to-path") == 0) { + printk(FMT_arg "\n", pb->args[pb->nargs]); + memdump((char*)arg2pointer(pb->args[1]), pb->args[pb->nargs]); + } else if (strcmp(service, "open") == 0) { + printk("0x" FMT_argx "\n", pb->args[pb->nargs]); + } else if (strcmp(service, "close") == 0) { /* do nothing */ - } else if (strcmp(pb->service, "read") == 0) { + } else if (strcmp(service, "read") == 0) { #ifdef DUMP_IO - printk("%ld\n", pb->args[pb->nargs]); - memdump((char*)pb->args[1], pb->args[pb->nargs]); + printk(FMT_arg "\n", pb->args[pb->nargs]); + memdump((char*)arg2pointer(pb->args[1]), pb->args[pb->nargs]); #endif - } else if (strcmp(pb->service, "write") == 0) { + } else if (strcmp(service, "write") == 0) { #ifdef DUMP_IO - printk("%ld\n", pb->args[pb->nargs]); + printk(FMT_arg "\n", pb->args[pb->nargs]); #endif - } else if (strcmp(pb->service, "seek") == 0) { + } else if (strcmp(service, "seek") == 0) { #ifdef DUMP_IO - printk("%ld\n", pb->args[pb->nargs]); + printk(FMT_arg "\n", pb->args[pb->nargs]); #endif - } else if (strcmp(pb->service, "claim") == 0) { - printk("0x%08lx\n", pb->args[pb->nargs]); - } else if (strcmp(pb->service, "release") == 0) { + } else if (strcmp(service, "claim") == 0) { + printk("0x" FMT_argx "\n", pb->args[pb->nargs]); + } else if (strcmp(service, "release") == 0) { /* do nothing */ - } else if (strcmp(pb->service, "boot") == 0) { + } else if (strcmp(service, "boot") == 0) { /* do nothing */ - } else if (strcmp(pb->service, "enter") == 0) { + } else if (strcmp(service, "enter") == 0) { /* do nothing */ - } else if (strcmp(pb->service, "exit") == 0) { + } else if (strcmp(service, "exit") == 0) { /* do nothing */ - } else if (strcmp(pb->service, "test-method") == 0) { - printk("0x%08lx\n", pb->args[pb->nargs]); + } else if (strcmp(service, "test-method") == 0) { + printk("0x" FMT_argx "\n", pb->args[pb->nargs]); } else { printk("of_client_interface return:"); for (i = 0; i < pb->nret; i++) { - printk(" %lx", pb->args[pb->nargs + i]); + printk(" %" PRIxARG, pb->args[pb->nargs + i]); } printk("\n"); } @@ -233,17 +269,18 @@ static int handle_calls( prom_args_t *pb ) { int i, dstacksave = dstackcnt; - long val; + prom_uarg_t val; #ifdef DEBUG_CIF - printk("%s %s ([%ld] -- [%ld])\n", pb->service, (char *)pb->args[0], - pb->nargs, pb->nret); + printk("%s %s ([" FMT_arg "] -- [" FMT_arg "])\n", get_service(pb), + (char *)arg2pointer(pb->args[0]), + pb->nargs, pb->nret); #endif for( i=pb->nargs-1; i>=0; i-- ) PUSH( pb->args[i] ); - push_str( pb->service ); + push_str(get_service(pb)); fword("client-call-iface"); /* Drop the return code from client-call-iface (status is handled by the @@ -260,17 +297,18 @@ handle_calls( prom_args_t *pb ) } #ifdef DEBUG_CIF - /* useful for debug but not necessarily an error */ - if( i != pb->nret || dstackcnt != dstacksave ) { - printk("%s '%s': possible argument error (%ld--%ld) got %d\n", - pb->service, (char*)pb->args[0], pb->nargs-2, pb->nret, i ); - } - - printk("handle_calls return: "); - for (i = 0; i < pb->nret; i++) { - printk("%lx ", pb->args[pb->nargs + i]); - } - printk("\n"); + /* useful for debug but not necessarily an error */ + if (i != pb->nret || dstackcnt != dstacksave) { + printk("%s '%s': possible argument error (" FMT_arg "--" FMT_arg ") got %d\n", + get_service(pb), (char*)arg2pointer(pb->args[0]), + pb->nargs - 2, pb->nret, i); + } + + printk("handle_calls return:"); + for (i = 0; i < pb->nret; i++) { + printk(" %" PRIxARG, pb->args[pb->nargs + i]); + } + printk("\n"); #endif dstackcnt = dstacksave; @@ -292,21 +330,21 @@ of_client_interface( int *params ) #endif /* call-method exceptions are special */ - if( !strcmp("call-method", pb->service) || !strcmp("interpret", pb->service) ) + if (!strcmp("call-method", get_service(pb)) || !strcmp("interpret", get_service(pb))) return handle_calls( pb ); dstacksave = dstackcnt; for( i=pb->nargs-1; i>=0; i-- ) PUSH( pb->args[i] ); - push_str( pb->service ); + push_str(get_service(pb)); fword("client-iface"); if( (val=POP()) ) { dstackcnt = dstacksave; if( val == -1 ) - printk("Unimplemented service %s ([%ld] -- [%ld])\n", - pb->service, pb->nargs, pb->nret ); + printk("Unimplemented service %s ([" FMT_arg "] -- [" FMT_arg "])\n", + get_service(pb), pb->nargs, pb->nret ); #ifdef DEBUG_CIF else printk("ERROR!\n"); @@ -320,7 +358,7 @@ of_client_interface( int *params ) if( dstackcnt != dstacksave ) { #ifdef DEBUG_CIF printk("service %s: possible argument error (%d %d)\n", - pb->service, i, dstackcnt - dstacksave ); + get_service(pb), i, dstackcnt - dstacksave ); #endif /* Some clients request less parameters than the CIF method returns, e.g. getprop with OpenSolaris. Hence we drop any -- 1.7.3

3 6

[commit] r986 - trunk/openbios-devel/include/arch/ppc
by repository service 19 Dec '10

19 Dec '10

Author: afaerber Date: Sun Dec 19 14:37:43 2010 New Revision: 986 URL: http://tracker.coreboot.org/trac/openbios/changeset/986 Log: ppc: Prepare more assembler macros for ppc64 compatibility Adopt macro names from Linux. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Acked-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/include/arch/ppc/asmdefs.h Modified: trunk/openbios-devel/include/arch/ppc/asmdefs.h ============================================================================== --- trunk/openbios-devel/include/arch/ppc/asmdefs.h Fri Dec 17 15:25:14 2010 (r985) +++ trunk/openbios-devel/include/arch/ppc/asmdefs.h Sun Dec 19 14:37:43 2010 (r986) @@ -100,13 +100,21 @@ #endif #ifdef __powerpc64__ +#define PPC_LL ld +#define PPC_STL std +#define PPC_STLU stdu #define RFI rfid #define MTMSRD(r) mtmsrd r #define BRANCH_LABEL(name) . ## name +#define PPC_LR_STKOFF 16 #else +#define PPC_LL lwz +#define PPC_STL stw +#define PPC_STLU stwu #define RFI rfi #define MTMSRD(r) mtmsr r #define BRANCH_LABEL(name) name +#define PPC_LR_STKOFF 4 #endif #ifndef __darwin__

1 0

[RFT] ppc64 OpenBIOS
by Andreas Färber 18 Dec '10

18 Dec '10

Hello, Except for some fs/iso9660/ issues, ppc64 guests are booting for me with the last five OpenBIOS patches posted. You can find them together with the config change to use fs/grubfs/ here: git://repo.or.cz/openbios/afaerber.git ppc64-boot Please test your favorite ppc64 kernels and images with obj-ppc64/ openbios-qemu.elf! If I don't hear of regressions, I'll commit those patches. Once that is done and the iso9660 issues hopefully fixed, I would ask for Blue to commit openbios-ppc and openbios-ppc64 blobs to QEMU. I'll then prepare a QEMU patch to switch the default qemu-system-ppc64 ppc_newworld.c BIOS from openbios-ppc to openbios-ppc64. Thanks, Andreas

2 3

[PATCH] ppc: unexpected_excep() needs an absolute branch
by Andreas Färber 17 Dec '10

17 Dec '10

When called from address 0x700, trap_error must not use a relative branch to unexpected_excep() since that is beyond __vectors_end. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> --- arch/ppc/qemu/start.S | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/arch/ppc/qemu/start.S b/arch/ppc/qemu/start.S index b227ef2..4b25650 100644 --- a/arch/ppc/qemu/start.S +++ b/arch/ppc/qemu/start.S @@ -288,7 +288,9 @@ exception_return: _GLOBAL(__divide_error): trap_error: mflr r3 - b BRANCH_LABEL(unexpected_excep) + LOAD_REG_FUNC(r4, unexpected_excep) + mtctr r4 + bctr VECTOR( 0x100, "SRE" ): b _entry -- 1.7.3

1 1

[commit] r985 - trunk/openbios-devel/arch/ppc/qemu
by repository service 17 Dec '10

17 Dec '10

Author: afaerber Date: Fri Dec 17 15:25:14 2010 New Revision: 985 URL: http://tracker.coreboot.org/trac/openbios/changeset/985 Log: ppc: unexpected_excep() needs an absolute branch When called from address 0x700, trap_error must not use a relative branch to unexpected_excep() since that is beyond __vectors_end. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/arch/ppc/qemu/start.S Modified: trunk/openbios-devel/arch/ppc/qemu/start.S ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/start.S Sun Dec 12 21:09:49 2010 (r984) +++ trunk/openbios-devel/arch/ppc/qemu/start.S Fri Dec 17 15:25:14 2010 (r985) @@ -288,7 +288,9 @@ _GLOBAL(__divide_error): trap_error: mflr r3 - b BRANCH_LABEL(unexpected_excep) + LOAD_REG_FUNC(r4, unexpected_excep) + mtctr r4 + bctr VECTOR( 0x100, "SRE" ): b _entry

1 0

Re: [OpenBIOS] [PATCHv8 00/16] boot order specification
by Blue Swirl 17 Dec '10

17 Dec '10

On Wed, Dec 8, 2010 at 11:34 AM, Gleb Natapov <gleb(a)redhat.com> wrote: > Forget to save a couple of buffers before sending version 7 :( > > Anthony, Blue can this be applied now? I made some more tests, this time with PPC. I modified OpenBIOS to print out the boot device list: $ qemu-system-ppc -drive if=none,id=hda,file=/dev/null -device ide-drive,drive=hda,bootindex=1 -drive if=none,id=cd,file=/dev/null -device ide-drive,drive=cd,bootindex=0 -nographic -prom-env 'auto-boot?=false' -L . qemu-system-ppc: pci_add_option_rom: failed to find romfile "vgabios-stdvga.bin" Could not open option rom 'pxe-ne2k_pci.bin': No such file or directory >> ============================================================= >> OpenBIOS 1.0 [Nov 28 2010 19:37] >> Configuration device id QEMU version 1 machine id 2 >> CPUs: 1 >> Memory: 128M >> UUID: 00000000-0000-0000-0000-000000000000 >> CPU type PowerPC,750 >> bootindex /grackle@fec00000/ide@3/drive@1/disk@1 >> /grackle@fec00000/ide@3/drive@1/disk@0 Welcome to OpenBIOS v1.0 built on Nov 28 2010 19:37 0 > show-devs 7be6324 / 7be6440 /aliases 7be64e4 /openprom (BootROM) 7bebfa0 /openprom/client-services 7be668c /options 7be6704 /chosen 7be67e8 /builtin 7be688c /builtin/console 7bebcac /packages 7becda8 /packages/cmdline 7becee8 /packages/disk-label 7bedb58 /packages/terminal-emulator 7bee548 /packages/deblocker 7bee89c /packages/hfsplus-files 7beeb3c /packages/hfs-files 7beedd8 /packages/ext2-files 7bef010 /packages/iso9660-files 7bef248 /packages/grubfs-files 7bef480 /packages/mac-parts 7bef6b8 /packages/pc-parts 7bef8ec /packages/xcoff-loader 7bef9b8 /packages/elf-loader 7befa80 /packages/bootinfo-loader 7bed958 /cpus 7bf2fe8 /cpus/PowerPC,750@0 (cpu) 7beda58 /memory@0 (memory) 7befb4c /pci@80000000 (pci) 7beff64 /pci@80000000/QEMU,VGA@1 (display) 7bf0438 /pci@80000000/NE2000@2 (network) 7bf0814 /pci@80000000/pci-ata@3 (pci-ide) 7bf0c50 /pci@80000000/pci-ata@3/ata-1@500 (ata) 7bf0dd0 /pci@80000000/pci-ata@3/ata-2@600 (ata) 7bf0f50 /pci@80000000/pci-ata@3/ata-2@600/disk@1 (block) 7bf131c /pci@80000000/pci-ata@3/ata-2@600/disk@0 (block) 7bf1674 /pci@80000000/mac-io@4 (mac-io) 7bf1b54 /pci@80000000/mac-io@4/via-cuda@16000 (via-cuda) 7bf1d70 /pci@80000000/mac-io@4/via-cuda@16000/adb (adb) 7bf1ed8 /pci@80000000/mac-io@4/via-cuda@16000/adb/keyboard@8 (keyboard) 7bf2080 /pci@80000000/mac-io@4/via-cuda@16000/adb/mouse@9 (mouse) 7bf220c /pci@80000000/mac-io@4/via-cuda@16000/rtc (rtc) 7bf23f4 /pci@80000000/mac-io@4/nvram@60000 (nvram) 7bf2614 /pci@80000000/mac-io@4/escc@13000 (escc) 7bf271c /pci@80000000/mac-io@4/escc@13000/ch-a@13020 (serial) 7bf29b4 /pci@80000000/mac-io@4/escc@13000/ch-b@13000 (serial) 7bf2c20 /pci@80000000/mac-io@4/ata-3@20000 (ata) ok /grackle@fec00000/ide@3/drive@1/disk@1 does not match /pci@80000000/pci-ata@3/ata-2@600/disk@1. I wonder where '@80000000' comes from. A dump of original g3beige device tree is here: http://penguinppc.org/historical/dev-trees-html/g3_beige_300.html But actually the tree generated by OpenBIOS looks more like g3bw one: http://penguinppc.org/historical/dev-trees-html/g3bw_400.html How can we get the names to be more compatible? At least s/grackle/pci/ is easy to do in QEMU, but which instance (QEMU or OpenBIOS) should handle pci-ata vs ide change? What should we do with ata-2@600 vs drive@1?

6 16

ppc64 boot issues
by Andreas Färber 13 Dec '10

13 Dec '10

Hello, With or without the pending ofmem patches, ppc64 boot currently hangs after "Trying cd:,\\:tbxi..." (before "Trying cd:,\ppc\chrp \bootfile.exe..."). Symptom is, 0x700 program exception vector (not 0xfff00700) is being called with SRR1 pointing to some address that's neither in the low vectors range nor in OpenBIOS itself apparently. I noticed that branching relatively to unexpected_excep from there is wrong and patched it to bctr there (which unfortunately appears to break 32-bit ppc64), but usually it does not manage to properly do the printk() Here's what I found out so far: * a breakpoint for bootinfo_loader_init() or so is not reached * The "Trying" comes from (encode-bootpath) in forth/debugging/client.fs * `debug (encode-bootpath) boot` does not return from open-dev * `debug open-dev` does not return from path-resolution * path-resolution gets called "endlessly" (5+ times single-stepping it), the hang occurred after successfully returning from some instance (after having successfully done so for a previous instance) Does anyone have a hunch what might be going wrong? Or tips how to further debug? Thanks, Andreas

3 4

[PATCH] forth: Pretty-print MMU translations property
by Andreas Färber 12 Dec '10

12 Dec '10

Display one MMU translation per row for .properties command. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> --- forth/admin/devices.fs | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/forth/admin/devices.fs b/forth/admin/devices.fs index 7a5b693..00b4f55 100644 --- a/forth/admin/devices.fs +++ b/forth/admin/devices.fs @@ -326,6 +326,30 @@ 3drop drop ; +\ Print the value of the MMU translations property +: .p-translations ( data len -- ) + 2dup + -rot ( data+len data len ) + >r >r [IFDEF] CONFIG_PPC + [IFDEF] CONFIG_PPC64 5 [ELSE] 4 [THEN] + [ELSE] + 3 + [THEN] 4 * dup ( data+len #bytes #bytes R: len data ) r> r> + bounds ( data+len #bytes #bytes data+len data ) ?do + 2dup <> if \ non-first byte in row + dup 3 and 0= if space then \ make numbers more readable + then + i c@ 2 0.r \ print byte + 1- dup 0= if \ end of row + 2 pick i 1+ > if \ non-last byte + cr \ start new line + d# 26 spaces \ indentation + then + drop dup \ update counter + then + loop + 2drop drop +; + \ This function hardwires data formats to particular node properties : (.property-by-name) ( name-str name-len data len -- ) 2over " reg" strcmp 0= if @@ -346,6 +370,10 @@ 1 1 2swap .p-reg 2drop exit then + 2over " translations" strcmp 0= if + .p-translations + 2drop exit + then then then then -- 1.7.3

3 11

[commit] r984 - trunk/openbios-devel/forth/admin
by repository service 12 Dec '10

12 Dec '10

Author: afaerber Date: Sun Dec 12 21:09:49 2010 New Revision: 984 URL: http://tracker.coreboot.org/trac/openbios/changeset/984 Log: forth: Fix MMU available pretty-printing for sparc64 On sparc64 a virtual address or size value is contained within one stack cell but that makes two property cells. The columns for the /virtual-memory "available" property thus looked wrong. Do read the number of cells from #address-cells but make sure the size is at least one to not break ppc. Cc: Tarl Neustaedter <tarl-b2(a)tarl.net> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/forth/admin/devices.fs Modified: trunk/openbios-devel/forth/admin/devices.fs ============================================================================== --- trunk/openbios-devel/forth/admin/devices.fs Sun Dec 12 21:08:25 2010 (r983) +++ trunk/openbios-devel/forth/admin/devices.fs Sun Dec 12 21:09:49 2010 (r984) @@ -408,7 +408,7 @@ " mmu" rot get-package-property 0= if decode-int nip nip ihandle>phandle active-package = if 2over " available" strcmp 0= if - 1 1 2swap .p-reg + my-#acells my-#scells 1 max 2swap .p-reg 2drop exit then 2over " translations" strcmp 0= if

1 0

[commit] r983 - trunk/openbios-devel/forth/admin
by repository service 12 Dec '10

12 Dec '10

Author: afaerber Date: Sun Dec 12 21:08:25 2010 New Revision: 983 URL: http://tracker.coreboot.org/trac/openbios/changeset/983 Log: forth: Pretty-print MMU translations property Display one MMU translation per row for .properties command. Define a variable number of columns to handle platform specifics. v3: * Only ppc includes the physical address in the translations property. Simplify loop by reverting to decreasing column offsets. v2: * Define columns for spacing. Add helpers to facilitate this. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/forth/admin/devices.fs Modified: trunk/openbios-devel/forth/admin/devices.fs ============================================================================== --- trunk/openbios-devel/forth/admin/devices.fs Sun Dec 12 14:44:18 2010 (r982) +++ trunk/openbios-devel/forth/admin/devices.fs Sun Dec 12 21:08:25 2010 (r983) @@ -326,6 +326,71 @@ 3drop drop ; +\ Return the number of cells per physical address +: .p-translations-#pacells ( -- #cells ) + " /" find-package if + " #address-cells" rot get-package-property if + 1 + else + decode-int nip nip 1 max + then + else + 1 + then +; + +\ Return the number of cells per translation entry +: .p-translations-#cells ( -- #cells ) + [IFDEF] CONFIG_PPC + my-#acells 3 * + .p-translations-#pacells + + [ELSE] + my-#acells 3 * + [THEN] +; + +\ Set up column offsets +: .p-translations-cols ( -- col1 ... coln #cols ) + .p-translations-#cells 4 * + [IFDEF] CONFIG_PPC + 4 - + dup 4 - + dup .p-translations-#pacells 4 * - + 3 + [ELSE] + my-#acells 4 * - + dup my-#scells 4 * - + 2 + [THEN] +; + +\ Print the value of the MMU translations property +: .p-translations ( data len -- ) + >r >r .p-translations-cols r> r> ( col1 ... coln #cols data len ) + 2dup + -rot ( col1 ... coln #cols data+len data len ) + >r >r .p-translations-#cells 4 * dup r> r> + ( col1 ... coln #cols data+len #bytes #bytes len data ) + bounds ( col1 ... coln #cols data+len #bytes #bytes data+len data ) ?do + 3 pick 4 + 4 ?do \ check all defined columns + i pick over = if + 2 spaces \ start new column + then + loop + 2dup <> if \ non-first byte in row + dup 3 and 0= if space then \ make numbers more readable + then + i c@ 2 0.r \ print byte + 1- dup 0= if \ end of row + 2 pick i 1+ > if \ non-last byte + cr \ start new line + d# 26 spaces \ indentation + then + drop dup \ update counter + then + loop + 2drop drop 0 ?do drop loop +; + \ This function hardwires data formats to particular node properties : (.property-by-name) ( name-str name-len data len -- ) 2over " reg" strcmp 0= if @@ -346,6 +411,10 @@ 1 1 2swap .p-reg 2drop exit then + 2over " translations" strcmp 0= if + .p-translations + 2drop exit + then then then then

1 0

[RFC] Switch OFMEM to use phys_addr_t for physical addresses
by Mark Cave-Ayland 12 Dec '10

12 Dec '10

Hi all, Here is my first attempt at switching over OFMEM to use phys_addr_t for physical addresses. It was mainly a case of going through all of the OFMEM APIs by hand and then updating the definitions used to hold physical addresses, along with swapping over range_t to use phys_addr_t on the assumption that sizeof(phys_addr_t) >= sizeof(ucell). Andreas - note I've not touched anything in ppc64 as I figure this is still experimental and I don't really have anything to test it with. This patch seems to work on my SPARC64/PPC tests here, but since it touches a core part of OpenBIOS I'd like to get a little more feedback before committing it. ATB, Mark. -- Mark Cave-Ayland - Senior Technical Architect PostgreSQL - PostGIS Sirius Corporation plc - control through freedom http://www.siriusit.co.uk t: +44 870 608 0063 Sirius Labs: http://www.siriusit.co.uk/labs

3 27

[commit] r982 - trunk/openbios-devel/arch/ppc/qemu
by repository service 12 Dec '10

12 Dec '10

Author: afaerber Date: Sun Dec 12 14:44:18 2010 New Revision: 982 URL: http://tracker.coreboot.org/trac/openbios/changeset/982 Log: ppc: Use unsigned long for effective addresses Adjust the special handling of ROM-to-RAM for ppc64. In particular this allows ISI and DSI exceptions to set up TLB entries for high addresses on ppc64. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sun Dec 12 14:12:20 2010 (r981) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sun Dec 12 14:44:18 2010 (r982) @@ -47,7 +47,7 @@ #define FREE_BASE 0x00004000UL #define OF_CODE_START 0xfff00000UL #define OF_CODE_SIZE 0x00100000 -#define IO_BASE 0x80000000 +#define IO_BASE 0x80000000UL #ifdef __powerpc64__ #define HASH_BITS 18 @@ -85,7 +85,7 @@ return FREE_BASE; } -static ucell get_heap_top(void) +static unsigned long get_heap_top(void) { return get_hash_base() - (32 + 64 + 64) * 1024; } @@ -217,11 +217,11 @@ /************************************************************************/ static phys_addr_t -ea_to_phys(ucell ea, ucell *mode) +ea_to_phys(unsigned long ea, ucell *mode) { phys_addr_t phys; - if (ea >= OF_CODE_START) { + if (ea >= OF_CODE_START && ea <= 0xffffffffUL) { /* ROM into RAM */ ea -= OF_CODE_START; phys = get_rom_base() + ea; @@ -242,7 +242,7 @@ } static void -hash_page_64(ucell ea, phys_addr_t phys, ucell mode) +hash_page_64(unsigned long ea, phys_addr_t phys, ucell mode) { static int next_grab_slot = 0; uint64_t vsid_mask, page_mask, pgidx, hash; @@ -308,7 +308,7 @@ } static void -hash_page_32(ucell ea, phys_addr_t phys, ucell mode) +hash_page_32(unsigned long ea, phys_addr_t phys, ucell mode) { #ifndef __powerpc64__ static int next_grab_slot = 0;

1 0

[commit] r981 - in trunk/openbios-devel: arch/ppc/qemu arch/sparc64 include/libopenbios libopenbios
by repository service 12 Dec '10

12 Dec '10

Author: afaerber Date: Sun Dec 12 14:12:20 2010 New Revision: 981 URL: http://tracker.coreboot.org/trac/openbios/changeset/981 Log: ofmem: Use phys_addr_t for physical addresses Based on Mark's previous work, let ofmem handle addresses wider than one cell. This is based on the assumption that sizeof(phys_addr_t) >= sizeof(ucell). Affected are in particular sparc32 (36 bits) and ppc64 (64 bits). As a consequence, some range_t related code shared with virtual/effective addresses needed to be migrated, too. Since both address types are unsigned this should be okay. v4: * Coding style fixes and comments, as suggested by Mark. v3: * Rebased: Prefer FMT_plx for trace output. * Convert some more places to phys_addr_t to avoid breakage on ppc64. * Add helpers ofmem_arch_{get_physaddr_cellsize,encode_physaddr}(), requested by Mark. v2: * Use FMT_physaddr_t in ofmem trace code. (by Mark) Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c trunk/openbios-devel/arch/sparc64/lib.c trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c trunk/openbios-devel/include/libopenbios/ofmem.h trunk/openbios-devel/libopenbios/ofmem_common.c Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sun Dec 5 15:16:13 2010 (r980) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sun Dec 12 14:12:20 2010 (r981) @@ -120,7 +120,7 @@ /* kill page mappings in provided range */ } -void ofmem_arch_early_map_pages(ucell phys, ucell virt, ucell size, ucell mode) +void ofmem_arch_early_map_pages(phys_addr_t phys, ucell virt, ucell size, ucell mode) { /* none yet */ } @@ -131,10 +131,29 @@ return NULL; } +int ofmem_arch_get_physaddr_cellsize(void) +{ +#ifdef CONFIG_PPC64 + return 2; +#else + return 1; +#endif +} + +int ofmem_arch_encode_physaddr(ucell *p, phys_addr_t value) +{ + int n = 0; +#ifdef CONFIG_PPC64 + p[n++] = value >> 32; +#endif + p[n++] = value; + return n; +} + /* Return size of a single MMU package translation property entry in cells */ int ofmem_arch_get_translation_entry_size(void) { - return 4; + return 3 + ofmem_arch_get_physaddr_cellsize(); } /* Generate translation property entry for PPC. @@ -149,10 +168,12 @@ */ void ofmem_arch_create_translation_entry(ucell *transentry, translation_t *t) { - transentry[0] = t->virt; - transentry[1] = t->size; - transentry[2] = t->phys; - transentry[3] = t->mode; + int i = 0; + + transentry[i++] = t->virt; + transentry[i++] = t->size; + i += ofmem_arch_encode_physaddr(&transentry[i], t->phys); + transentry[i++] = t->mode; } /************************************************************************/ @@ -182,7 +203,7 @@ /* misc */ /************************************************************************/ -ucell ofmem_arch_default_translation_mode(ucell phys) +ucell ofmem_arch_default_translation_mode(phys_addr_t phys) { /* XXX: Guard bit not set as it should! */ if (phys < IO_BASE) @@ -195,10 +216,10 @@ /* page fault handler */ /************************************************************************/ -static ucell +static phys_addr_t ea_to_phys(ucell ea, ucell *mode) { - ucell phys; + phys_addr_t phys; if (ea >= OF_CODE_START) { /* ROM into RAM */ @@ -221,7 +242,7 @@ } static void -hash_page_64(ucell ea, ucell phys, ucell mode) +hash_page_64(ucell ea, phys_addr_t phys, ucell mode) { static int next_grab_slot = 0; uint64_t vsid_mask, page_mask, pgidx, hash; @@ -270,7 +291,7 @@ .h = 0, .v = 1, - .rpn = (phys & ~0xfff) >> 12, + .rpn = (phys & ~0xfffUL) >> 12, .r = mode & (1 << 8) ? 1 : 0, .c = mode & (1 << 7) ? 1 : 0, .w = mode & (1 << 6) ? 1 : 0, @@ -287,7 +308,7 @@ } static void -hash_page_32(ucell ea, ucell phys, ucell mode) +hash_page_32(ucell ea, phys_addr_t phys, ucell mode) { #ifndef __powerpc64__ static int next_grab_slot = 0; @@ -341,7 +362,7 @@ } /* XXX Remove these ugly constructs when legacy 64-bit support is dropped. */ -static void hash_page(unsigned long ea, unsigned long phys, ucell mode) +static void hash_page(unsigned long ea, phys_addr_t phys, ucell mode) { if (is_ppc64()) hash_page_64(ea, phys, mode); @@ -354,7 +375,7 @@ { unsigned long dar, dsisr; ucell mode; - ucell phys; + phys_addr_t phys; asm volatile("mfdar %0" : "=r" (dar) : ); asm volatile("mfdsisr %0" : "=r" (dsisr) : ); @@ -368,7 +389,7 @@ { unsigned long nip, srr1; ucell mode; - ucell phys; + phys_addr_t phys; asm volatile("mfsrr0 %0" : "=r" (nip) : ); asm volatile("mfsrr1 %0" : "=r" (srr1) : ); Modified: trunk/openbios-devel/arch/sparc64/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/lib.c Sun Dec 5 15:16:13 2010 (r980) +++ trunk/openbios-devel/arch/sparc64/lib.c Sun Dec 12 14:12:20 2010 (r981) @@ -120,7 +120,8 @@ static void mmu_translate(void) { - ucell virt, phys, mode; + ucell virt, mode; + phys_addr_t phys; virt = POP(); @@ -352,7 +353,7 @@ } static void -map_pages(unsigned long phys, unsigned long virt, +map_pages(phys_addr_t phys, unsigned long virt, unsigned long size, unsigned long mode) { unsigned long tte_data, currsize; @@ -393,7 +394,7 @@ } } -void ofmem_map_pages(ucell phys, ucell virt, ucell size, ucell mode) +void ofmem_map_pages(phys_addr_t phys, ucell virt, ucell size, ucell mode) { return map_pages(phys, virt, size, mode); } @@ -405,7 +406,8 @@ static void mmu_map(void) { - ucell virt, size, mode, phys; + ucell virt, size, mode; + phys_addr_t phys; mode = POP(); size = POP(); @@ -453,7 +455,7 @@ unmap_pages(virt, size); } -void ofmem_arch_early_map_pages(ucell phys, ucell virt, ucell size, ucell mode) +void ofmem_arch_early_map_pages(phys_addr_t phys, ucell virt, ucell size, ucell mode) { if (mode & SPITFIRE_TTE_LOCKED) { // install locked tlb entries now @@ -514,7 +516,8 @@ static void mem_claim( void ) { - ucell phys=-1UL, size, align; + ucell size, align; + phys_addr_t phys=-1UL; align = POP(); size = POP(); @@ -534,7 +537,8 @@ static void mem_release( void ) { - ucell phys, size; + phys_addr_t phys; + ucell size; size = POP(); phys = POP(); @@ -548,7 +552,8 @@ static void mem_retain ( void ) { - ucell phys=-1UL, size, align; + ucell size, align; + phys_addr_t phys=-1UL; align = POP(); size = POP(); Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Sun Dec 5 15:16:13 2010 (r980) +++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Sun Dec 12 14:12:20 2010 (r981) @@ -95,7 +95,18 @@ /* misc */ /************************************************************************/ -ucell ofmem_arch_default_translation_mode( ucell phys ) +int ofmem_arch_get_physaddr_cellsize(void) +{ + return 1; +} + +int ofmem_arch_encode_physaddr(ucell *p, phys_addr_t value) +{ + p[0] = value; + return 1; +} + +ucell ofmem_arch_default_translation_mode( phys_addr_t phys ) { /* Writable, cacheable */ /* not privileged and not locked */ @@ -109,7 +120,7 @@ /* init / cleanup */ /************************************************************************/ -static int remap_page_range( ucell phys, ucell virt, ucell size, ucell mode ) +static int remap_page_range( phys_addr_t phys, ucell virt, ucell size, ucell mode ) { ofmem_claim_phys(phys, size, 0); ofmem_claim_virt(virt, size, 0); Modified: trunk/openbios-devel/include/libopenbios/ofmem.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/ofmem.h Sun Dec 5 15:16:13 2010 (r980) +++ trunk/openbios-devel/include/libopenbios/ofmem.h Sun Dec 12 14:12:20 2010 (r981) @@ -26,7 +26,7 @@ typedef struct mem_range { struct mem_range *next; - ucell start; + phys_addr_t start; /* sizeof(phys) >= sizeof(virt), e.g SPARC32 */ ucell size; } range_t; @@ -34,7 +34,7 @@ struct trans *next; ucell virt; /* chain is sorted by virt */ ucell size; - ucell phys; + phys_addr_t phys; ucell mode; } translation_t; @@ -63,14 +63,16 @@ extern ucell ofmem_arch_get_heap_top(void); extern ucell ofmem_arch_get_virt_top(void); extern retain_t* ofmem_arch_get_retained(void); +extern int ofmem_arch_get_physaddr_cellsize(void); +extern int ofmem_arch_encode_physaddr(ucell *p, phys_addr_t value); extern int ofmem_arch_get_translation_entry_size(void); extern void ofmem_arch_create_translation_entry(ucell *transentry, translation_t *t); -extern ucell ofmem_arch_default_translation_mode( ucell phys ); -extern void ofmem_arch_early_map_pages(ucell phys, ucell virt, ucell size, +extern ucell ofmem_arch_default_translation_mode( phys_addr_t phys ); +extern void ofmem_arch_early_map_pages(phys_addr_t phys, ucell virt, ucell size, ucell mode); extern void ofmem_arch_unmap_pages(ucell virt, ucell size); /* sparc64 uses this method */ -extern int ofmem_map_page_range( ucell phys, ucell virt, ucell size, +extern int ofmem_map_page_range( phys_addr_t phys, ucell virt, ucell size, ucell mode ); /* malloc interface */ @@ -93,18 +95,18 @@ extern void ofmem_register( phandle_t ph_memory, phandle_t ph_mmu ); extern ucell ofmem_claim( ucell addr, ucell size, ucell align ); -extern ucell ofmem_claim_phys( ucell mphys, ucell size, ucell align ); +extern phys_addr_t ofmem_claim_phys( phys_addr_t mphys, ucell size, ucell align ); extern ucell ofmem_claim_virt( ucell mvirt, ucell size, ucell align ); -extern ucell ofmem_retain( ucell phys, ucell size, ucell align ); +extern phys_addr_t ofmem_retain( phys_addr_t phys, ucell size, ucell align ); -extern int ofmem_map( ucell phys, ucell virt, ucell size, ucell mode ); +extern int ofmem_map( phys_addr_t phys, ucell virt, ucell size, ucell mode ); extern int ofmem_unmap( ucell virt, ucell size ); extern void ofmem_release( ucell virt, ucell size ); -extern void ofmem_release_phys( ucell phys, ucell size ); +extern void ofmem_release_phys( phys_addr_t phys, ucell size ); extern void ofmem_release_virt( ucell virt, ucell size ); -extern ucell ofmem_translate( ucell virt, ucell *ret_mode ); +extern phys_addr_t ofmem_translate( ucell virt, ucell *ret_mode ); #ifdef CONFIG_PPC #define PAGE_SHIFT 12 Modified: trunk/openbios-devel/libopenbios/ofmem_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/ofmem_common.c Sun Dec 5 15:16:13 2010 (r980) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Sun Dec 12 14:12:20 2010 (r981) @@ -49,7 +49,7 @@ { printk("--- Range %s ---\n", str ); for( ; r; r=r->next ) - printk("%08lx - %08lx\n", r->start, r->start + r->size -1 ); + printk(FMT_plx " - " FMT_plx "\n", r->start, r->start + r->size - 1); printk("\n"); } @@ -72,7 +72,7 @@ printk("--- Translations ---\n"); for( ; t; t=t->next ) - printk("%08lx -> %08lx [size %lx]\n", t->virt, t->phys, t->size ); + printk("%08lx -> " FMT_plx " [size %lx]\n", t->virt, t->phys, t->size); printk("\n"); } #endif @@ -246,8 +246,8 @@ { range_t *r; int ncells, prop_used, prop_size; - - ucell start, size, *prop; + phys_addr_t start; + ucell size, *prop; if (s_phandle_memory == 0) return; @@ -256,8 +256,10 @@ for( r = range, ncells = 0; r ; r=r->next, ncells++ ) { } - /* inverse of phys_range list could take 2 more cells for the tail */ - prop_used = (ncells+1) * sizeof(ucell) * 2; + /* inverse of phys_range list could take 2 or more additional cells for the tail + For /memory, physical addresses may be wider than one ucell. */ + prop_used = (ncells + 1) * sizeof(ucell) * + (((ph == s_phandle_memory) ? ofmem_arch_get_physaddr_cellsize() : 1) + 1); if (prop_used > *mem_prop_size) { @@ -291,7 +293,13 @@ size = r->start - start; if (size) { - prop[ncells++] = start; + if (ph == s_phandle_memory) { + /* physical address for /memory */ + ncells += ofmem_arch_encode_physaddr(&prop[ncells], start); + } else { + /* virtual address for MMU */ + prop[ncells++] = start; + } prop[ncells++] = size; } start = r->start + r->size; @@ -299,7 +307,13 @@ /* tail */ if (start < top_address) { - prop[ncells++] = start; + if (ph == s_phandle_memory) { + /* physical address for /memory */ + ncells += ofmem_arch_encode_physaddr(&prop[ncells], start); + } else { + /* virtual address for MMU */ + prop[ncells++] = start; + } prop[ncells++] = top_address - start; } @@ -323,7 +337,7 @@ /* client interface */ /************************************************************************/ -static int is_free( ucell ea, ucell size, range_t *r ) +static int is_free( phys_addr_t ea, ucell size, range_t *r ) { if( size == 0 ) return 1; @@ -336,7 +350,7 @@ return 1; } -static void add_entry_( ucell ea, ucell size, range_t **r ) +static void add_entry_( phys_addr_t ea, ucell size, range_t **r ) { range_t *nr; @@ -350,7 +364,7 @@ *r = nr; } -static int add_entry( ucell ea, ucell size, range_t **r ) +static int add_entry( phys_addr_t ea, ucell size, range_t **r ) { if( !is_free( ea, size, *r ) ) { OFMEM_TRACE("add_entry: range not free!\n"); @@ -380,7 +394,7 @@ } } -static void fill_range( ucell ea, ucell size, range_t **rr ) +static void fill_range( phys_addr_t ea, ucell size, range_t **rr ) { add_entry_( ea, size, rr ); join_ranges( rr ); @@ -388,9 +402,9 @@ #endif static ucell find_area( ucell align, ucell size, range_t *r, - ucell min, ucell max, int reverse ) + phys_addr_t min, phys_addr_t max, int reverse ) { - ucell base = min; + phys_addr_t base = min; range_t *r2; if( (align & (align-1)) ) { @@ -438,7 +452,7 @@ return -1; } -static ucell ofmem_claim_phys_( ucell phys, ucell size, ucell align, +static phys_addr_t ofmem_claim_phys_( phys_addr_t phys, ucell size, ucell align, ucell min, ucell max, int reverse ) { ofmem_t *ofmem = ofmem_arch_get_private(); @@ -463,9 +477,9 @@ } /* if align != 0, phys is ignored. Returns -1 on error */ -ucell ofmem_claim_phys( ucell phys, ucell size, ucell align ) +phys_addr_t ofmem_claim_phys( phys_addr_t phys, ucell size, ucell align ) { - OFMEM_TRACE("ofmem_claim phys=" FMT_ucellx " size=" FMT_ucellx + OFMEM_TRACE("ofmem_claim phys=" FMT_plx " size=" FMT_ucellx " align=" FMT_ucellx "\n", phys, size, align); @@ -506,12 +520,12 @@ } /* if align != 0, phys is ignored. Returns -1 on error */ -ucell ofmem_retain( ucell phys, ucell size, ucell align ) +phys_addr_t ofmem_retain( phys_addr_t phys, ucell size, ucell align ) { retain_t *retained = ofmem_arch_get_retained(); - ucell retain_phys; + phys_addr_t retain_phys; - OFMEM_TRACE("ofmem_retain phys=" FMT_ucellx " size=" FMT_ucellx + OFMEM_TRACE("ofmem_retain phys=" FMT_plx " size=" FMT_ucellx " align=" FMT_ucellx "\n", phys, size, align); @@ -530,7 +544,8 @@ ucell ofmem_claim( ucell addr, ucell size, ucell align ) { ofmem_t *ofmem = ofmem_arch_get_private(); - ucell virt, phys; + ucell virt; + phys_addr_t phys; ucell offs = addr & 0xfff; OFMEM_TRACE("ofmem_claim " FMT_ucellx " " FMT_ucellx " " FMT_ucellx "\n", addr, size, align ); @@ -595,13 +610,13 @@ } } -int ofmem_map_page_range( ucell phys, ucell virt, ucell size, ucell mode ) +int ofmem_map_page_range( phys_addr_t phys, ucell virt, ucell size, ucell mode ) { ofmem_t *ofmem = ofmem_arch_get_private(); translation_t *t, **tt; OFMEM_TRACE("ofmem_map_page_range " FMT_ucellx - " -> " FMT_ucellx " " FMT_ucellx " mode " FMT_ucellx "\n", + " -> " FMT_plx " " FMT_ucellx " mode " FMT_ucellx "\n", virt, phys, size, mode ); split_trans( virt ); @@ -677,7 +692,7 @@ *plinkentry = t->next; OFMEM_TRACE("unmap_page_range found " - FMT_ucellx " -> " FMT_ucellx " " FMT_ucellx + FMT_ucellx " -> " FMT_plx " " FMT_ucellx " mode " FMT_ucellx "\n", t->virt, t->phys, t->size, t->mode ); @@ -693,7 +708,7 @@ return 0; } -int ofmem_map( ucell phys, ucell virt, ucell size, ucell mode ) +int ofmem_map( phys_addr_t phys, ucell virt, ucell size, ucell mode ) { /* printk("+ofmem_map: %08lX --> %08lX (size %08lX, mode 0x%02X)\n", virt, phys, size, mode ); */ @@ -701,7 +716,7 @@ if( (phys & 0xfff) || (virt & 0xfff) || (size & 0xfff) ) { OFMEM_TRACE("ofmem_map: Bad parameters (" - FMT_ucellX " " FMT_ucellX " " FMT_ucellX ")\n", + FMT_plx " " FMT_ucellX " " FMT_ucellX ")\n", phys, virt, size ); phys &= ~0xfff; @@ -751,7 +766,7 @@ } /* virtual -> physical. */ -ucell ofmem_translate( ucell virt, ucell *mode ) +phys_addr_t ofmem_translate( ucell virt, ucell *mode ) { ofmem_t *ofmem = ofmem_arch_get_private(); translation_t *t; @@ -776,9 +791,9 @@ } /* release memory allocated by ofmem_claim_phys */ -void ofmem_release_phys( ucell phys, ucell size ) +void ofmem_release_phys( phys_addr_t phys, ucell size ) { - OFMEM_TRACE("ofmem_release_phys addr=" FMT_ucellx " size=" FMT_ucellx "\n", + OFMEM_TRACE("ofmem_release_phys addr=" FMT_plx " size=" FMT_ucellx "\n", phys, size); ofmem_t *ofmem = ofmem_arch_get_private(); @@ -802,8 +817,8 @@ __func__, virt, size); ucell mode; - ucell phys = ofmem_translate(virt, &mode); - if (phys == (ucell)-1) { + phys_addr_t phys = ofmem_translate(virt, &mode); + if (phys == (phys_addr_t)-1) { OFMEM_TRACE("%s: no mapping\n", __func__); return; }

1 0

[PATCH] Zero-pad byte properties
by Andreas Färber 06 Dec '10

06 Dec '10

.properties before: someproperty -- 3 : 1 42 3 Now: someproperty -- 3 : 01 42 03 Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> --- forth/admin/devices.fs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/forth/admin/devices.fs b/forth/admin/devices.fs index e24c6da..dbb4646 100644 --- a/forth/admin/devices.fs +++ b/forth/admin/devices.fs @@ -283,7 +283,7 @@ dup r@ + c@ ( len n ch ) - pocket tohexstr type ." " + pocket tohexstr dup 2 <> if ." 0" then type ." " 1+ repeat 2drop r> drop 1 -- 1.7.3

5 52

[commit] r980 - trunk/openbios-devel/arch/ppc/qemu
by repository service 05 Dec '10

05 Dec '10

Author: afaerber Date: Sun Dec 5 15:16:13 2010 New Revision: 980 URL: http://tracker.coreboot.org/trac/openbios/changeset/980 Log: ppc: Simplify get_ram_bottom() Avoid a cast by adjusting the define. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sun Dec 5 02:15:57 2010 (r979) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sun Dec 5 15:16:13 2010 (r980) @@ -44,7 +44,7 @@ * */ -#define FREE_BASE 0x00004000 +#define FREE_BASE 0x00004000UL #define OF_CODE_START 0xfff00000UL #define OF_CODE_SIZE 0x00100000 #define IO_BASE 0x80000000 @@ -82,7 +82,7 @@ unsigned long get_ram_bottom(void) { - return (unsigned long)FREE_BASE; + return FREE_BASE; } static ucell get_heap_top(void)

1 0

[commit] r979 - trunk/openbios-devel/forth/lib
by repository service 05 Dec '10

05 Dec '10

Author: afaerber Date: Sun Dec 5 02:15:57 2010 New Revision: 979 URL: http://tracker.coreboot.org/trac/openbios/changeset/979 Log: forth: Fix ([IF]) to handle nested [IFDEF] as well Depending on the condition, either the [IFDEF] FOO or the [ELSE] would get compiled as an [IF], eating words until [ELSE] or [THEN] respectively. While doing so, [IFDEF] does not get compiled to [IF], so we need to handle nested [IFDEF] to account for its [ELSE] or [THEN]. This fixes [IFDEF] not disabling the full section of code. Thanks to Segher for pointing me in the right direction. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Segher Boessenkool <segher(a)kernel.crashing.org> Modified: trunk/openbios-devel/forth/lib/preprocessor.fs Modified: trunk/openbios-devel/forth/lib/preprocessor.fs ============================================================================== --- trunk/openbios-devel/forth/lib/preprocessor.fs Sun Nov 28 21:03:46 2010 (r978) +++ trunk/openbios-devel/forth/lib/preprocessor.fs Sun Dec 5 02:15:57 2010 (r979) @@ -19,6 +19,7 @@ repeat 2dup " [IF]" strcmp 0= if 1 throw then + 2dup " [IFDEF]" strcmp 0= if 1 throw then 2dup " [ELSE]" strcmp 0= if 2 throw then 2dup " [THEN]" strcmp 0= if 3 throw then " \\" strcmp 0= if linefeed parse 2drop then

1 0

Nested [IFDEF]s not working?
by Andreas Färber 04 Dec '10

04 Dec '10

Hello, A construct like: [IFDEF] CONFIG_PPC [IFDEF] CONFIG_PPC64 5 [ELSE] 4 [THEN] [ELSE] [IFDEF] CONFIG_SPARC64 6 [ELSE] 3 [THEN] [THEN] has been seen to return, e.g., 4 3 according to the debug word. Is this nesting forbidden in Forth? Easily fixable? A better way to do this? I do want a final catch-all since returning no value would have unexpected results, and we currently do not have a define CONFIG_PPC32 so that a concatenation of independent [IFDEF]...[THEN]s wouldn't work. TIA, Andreas

3 5

Reducing OpenBIOS memory footprint
by Mark Cave-Ayland 02 Dec '10

02 Dec '10

Hi folks, It's taken me a lot longer to get to grips with moving SPARC32 to OFMEM than expected, mostly due to problems with the increased BSS size of the resulting image causing several large headaches. Having spent some time looking at where the memory is currently being used, it strikes me that there are 2 main places where we can claim some back: i) Reduce (remove) the runtime memory allocated to the Forth machine One interesting aspect of the current design is that we have 2 memory allocation ranges - the Forth machine memory which is used for alloc-mem and free-mem, and also the OFMEM ranges. For example, in SPARC32 this is set to 256K which given the large I/O space requirements for the frame buffer, is about a quarter of the total memory. I'd like to suggest that we unify the memory management by removing the Forth implementations of alloc-mem/free-mem and replace them with wrappers to the internal ofmem_malloc() and ofmem_free() functions. This would then enable us to have one continuous pool of allocatable memory which could be used for everything. One slight issue with this is that there are a few references to alloc-mem/free-mem within the internal Forth code. These are mainly for allocating static buffers, and so I believe these could be removed and replaced by functions that simply allocate memory within the dictionary itself. ii) Avoid re-allocation of memory for the Forth dictionary At runtime we currently have two copies of the dictionary held within memory - the first is the actual static dictionary data, while the second is the relocated dictionary image within the BSS. In the case of SPARC32 this is responsible for just over 100K of the BSS image size. Rather than having to allocate a second copy of the dictionary, would it make sense to embed the fixed size dictionary directly within the OpenBIOS image? As an example SPARC32 specifies 256K for the total dictionary size. I think it should be possible to rewrite the relocation routine to relocate the dictionary 'in place' and then remove the relocation data so that the dictionary can extend normally up to its final limit. The downside of this is that the ROM images will be bigger on disk, but I don't feel that this should be too much of an issue. I realise that these two ideas are probably fairly controversial, but they should both help considerably reduce the size of the OpenBIOS runtime memory footprint. Thoughts/comments/criticisms? ATB, Mark. -- Mark Cave-Ayland - Senior Technical Architect PostgreSQL - PostGIS Sirius Corporation plc - control through freedom http://www.siriusit.co.uk t: +44 870 608 0063 Sirius Labs: http://www.siriusit.co.uk/labs

3 5

[commit] r969 - in trunk/openbios-devel/arch: ppc/qemu ppc64/qemu
by repository service 30 Nov '10

30 Nov '10

Author: afaerber Date: Thu Nov 25 22:56:23 2010 New Revision: 969 URL: http://tracker.coreboot.org/trac/openbios/changeset/969 Log: ppc: Set up TOC base for ppc64 r2 points to TOC base, __toc_start + 0x8000. This value is stored as part of the function descriptor. Include some related ELF sections in the linker script. Cc: Alexander Graf <agraf(a)suse.de> Cc: Segher Boessenkool <segher(a)kernel.crashing.org> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/arch/ppc/qemu/start.S trunk/openbios-devel/arch/ppc64/qemu/ldscript Modified: trunk/openbios-devel/arch/ppc/qemu/start.S ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/start.S Thu Nov 25 22:53:25 2010 (r968) +++ trunk/openbios-devel/arch/ppc/qemu/start.S Thu Nov 25 22:56:23 2010 (r969) @@ -445,6 +445,13 @@ /* save memory size in stack */ +#ifdef __powerpc64__ + /* set up TOC pointer */ + + LOAD_REG_IMMEDIATE(r2, setup_mmu) + ld r2, 8(r2) +#endif + bl BRANCH_LABEL(setup_mmu) bl BRANCH_LABEL(entry) 1: nop Modified: trunk/openbios-devel/arch/ppc64/qemu/ldscript ============================================================================== --- trunk/openbios-devel/arch/ppc64/qemu/ldscript Thu Nov 25 22:53:25 2010 (r968) +++ trunk/openbios-devel/arch/ppc64/qemu/ldscript Thu Nov 25 22:56:23 2010 (r969) @@ -41,8 +41,18 @@ _data = .; *(.data) *(.data.*) + *(.toc1) + *(.branch_lt) _edata = .; } + .opd : { + *(.opd) + } + .got : { + __toc_start = .; + *(.got) + *(.toc) + } .bss ALIGN(4096): { _bss = .;

4 19

[PATCH] Rename conflicting hfsplus files
by Blue Swirl 28 Nov '10

28 Nov '10

Files in fs/hfs and fs/hfsplus have same names, this causes problems during linkage. Use prefix 'hfsp_' for the conflicting files. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> --- fs/hfsplus/btree.c | 372 ----------------------- fs/hfsplus/build.xml | 6 +- fs/hfsplus/hfsp_btree.c | 372 +++++++++++++++++++++++ fs/hfsplus/hfsp_record.c | 759 ++++++++++++++++++++++++++++++++++++++++++++++ fs/hfsplus/hfsp_volume.c | 314 +++++++++++++++++++ fs/hfsplus/record.c | 759 ---------------------------------------------- fs/hfsplus/volume.c | 314 ------------------- 7 files changed, 1448 insertions(+), 1448 deletions(-) delete mode 100644 fs/hfsplus/btree.c create mode 100644 fs/hfsplus/hfsp_btree.c create mode 100644 fs/hfsplus/hfsp_record.c create mode 100644 fs/hfsplus/hfsp_volume.c delete mode 100644 fs/hfsplus/record.c delete mode 100644 fs/hfsplus/volume.c diff --git a/fs/hfsplus/btree.c b/fs/hfsplus/btree.c deleted file mode 100644 index 5409418..0000000 --- a/fs/hfsplus/btree.c +++ /dev/null @@ -1,372 +0,0 @@ -/* - * libhfs - library for reading and writing Macintosh HFS volumes - * The fucntions are used to handle the various forms of btrees - * found on HFS+ volumes. - * - * The fucntions are used to handle the various forms of btrees - * found on HFS+ volumes. - * - * Copyright (C) 2000 Klaus Halfmann <khalfmann(a)libra.de> - * Original 1996-1998 Robert Leslie <rob(a)mars.org> - * Additional work by Brad Boyer (flar(a)pants.nu) - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, - * MA 02110-1301, USA. - * - * $Id: btree.c,v 1.14 2000/10/25 05:43:04 hasi Exp $ - */ - -#include "config.h" -#include "libhfsp.h" -#include "volume.h" -#include "btree.h" -#include "record.h" -#include "swab.h" - -/* Read the node from the given buffer and swap the bytes. - * - * return pointer after reading the structure - */ -static void* btree_readnode(btree_node_desc* node, void *p) -{ - node->next = bswabU32_inc(p); - node->prev = bswabU32_inc(p); - node->kind = bswabU8_inc(p); - node->height = bswabU8_inc(p); - node->num_rec = bswabU16_inc(p); - node->reserved = bswabU16_inc(p); - return p; -} - -/* read a btree header from the given buffer and swap the bytes. - * - * return pointer after reading the structure - */ -static void* btree_readhead(btree_head* head, void *p) -{ - UInt32 *q; - head->depth = bswabU16_inc(p); - head->root = bswabU32_inc(p); - head->leaf_count = bswabU32_inc(p); - head->leaf_head = bswabU32_inc(p); - head->leaf_tail = bswabU32_inc(p); - head->node_size = bswabU16_inc(p); - head->max_key_len = bswabU16_inc(p); - head->node_count = bswabU32_inc(p); - head->free_nodes = bswabU32_inc(p); - head->reserved1 = bswabU16_inc(p); - head->clump_size = bswabU32_inc(p); - head->btree_type = bswabU8_inc(p); - head->reserved2 = bswabU8_inc(p); - head->attributes = bswabU32_inc(p); - // skip reserved bytes - q=((UInt32*) p); - // ((UInt32*) p) += 16; - q+=16; - return q; -} - -/* Priority of the depth of the node compared to LRU value. - * Should be the average number of keys per node but these vary. */ -#define DEPTH_FACTOR 1000 - -/* Cache size is height of tree + this value - * Really big numbers wont help in case of ls -R - */ -#define EXTRA_CACHESIZE 3 - -/* Not in use by now ... */ -#define CACHE_DIRTY 0x0001 - -/* Intialize cache with default cache Size, - * must call node_cache_close to deallocate memory */ -static int node_cache_init(node_cache* cache, btree* tree, int size) -{ - int nodebufsize; - char * buf; - - cache->size = size; - cache->currindex = 0; - nodebufsize = tree->head.node_size + sizeof(node_buf); - buf = malloc(size *(sizeof(node_entry) + nodebufsize)); - if (!buf) - return -1; - cache -> nodebufsize = nodebufsize; - cache -> entries = (node_entry*) buf; - cache -> buffers = (char*) &cache->entries[size]; - bzero(cache->entries, size*sizeof(node_entry)); - return 0; -} - -/* Like cache->buffers[i], since size of node_buf is variable */ -static inline node_buf* node_buf_get(node_cache* cache, int i) -{ - return (node_buf*) (cache->buffers + (i * cache->nodebufsize)); -} - -/* flush the node at index */ -static void node_cache_flush_node(node_cache* cache, int index) -{ - // NYI - cache -> entries[index].index = 0; // invalidate entry -} - -static void node_cache_close(node_cache* cache) -{ - if (!cache->entries) // not (fully) intialized ? - return; - free(cache->entries); -} - -/* Load the cach node indentified by index with - * the node identified by node_index */ - -static node_buf* node_cache_load_buf - (btree* bt, node_cache* cache, int index, UInt16 node_index) -{ - node_buf *result = node_buf_get(cache ,index); - UInt32 blkpernode = bt->blkpernode; - UInt32 block = node_index * blkpernode; - void* p = volume_readfromfork(bt->vol, result->node, bt->fork, - block, blkpernode, HFSP_EXTENT_DATA, bt->cnid); - node_entry *e = &cache->entries[index]; - - if (!p) - return NULL; // evil ... - - result->index = node_index; - btree_readnode(&result->desc, p); - - e -> priority = result->desc.height * DEPTH_FACTOR; - e -> index = node_index; - return result; -} - -/* Read node at given index, using cache. - */ -node_buf* btree_node_by_index(btree* bt, UInt16 index) -{ - node_cache* cache = &bt->cache; - int oldindex, lruindex; - int currindex = cache->currindex; - UInt32 prio; - node_entry *e; - - // Shortcut acces to current node, will not change priorities - if (cache->entries[currindex].index == index) - return node_buf_get(cache ,currindex); - oldindex = currindex; - if (currindex == 0) - currindex = cache->size; - currindex--; - lruindex = oldindex; // entry to be flushed when needed - prio = 0; // current priority - while (currindex != oldindex) // round robin - { - e = &cache->entries[currindex]; - if (e->index == index) // got it - { - if (e->priority != 0) // already top, uuh - e->priority--; - cache->currindex = currindex; - return node_buf_get(cache ,currindex); - } - else - { - if (!e->index) - { - lruindex = currindex; - break; // empty entry, load it - } - if (e->priority != UINT_MAX) // already least, uuh - e->priority++; - } - if (prio < e->priority) - { - lruindex = currindex; - prio = e->priority; - } - if (currindex == 0) - currindex = cache->size; - currindex--; - } - e = &cache->entries[lruindex]; - cache->currindex = lruindex; - if (e->flags & CACHE_DIRTY) - node_cache_flush_node( cache, lruindex); - return node_cache_load_buf (bt, cache, lruindex, index); -} - -/** intialize the btree with the first entry in the fork */ -static int btree_init(btree* bt, volume* vol, hfsp_fork_raw* fork) -{ - void *p; - char buf[vol->blksize]; - UInt16 node_size; - btree_node_desc node; - - bt->vol = vol; - bt->fork = fork; - p = volume_readfromfork(vol, buf, fork, 0, 1, - HFSP_EXTENT_DATA, bt->cnid); - if (!p) - return -1; - p = btree_readnode(&node, p); - if (node.kind != HFSP_NODE_HEAD) - return -1; // should not happen ? - btree_readhead(&bt->head, p); - - node_size = bt->head.node_size; - bt->blkpernode = node_size / vol->blksize; - - if (bt->blkpernode == 0 || vol->blksize * - bt->blkpernode != node_size) - return -1; // should never happen ... - - node_cache_init(&bt->cache, bt, bt->head.depth + EXTRA_CACHESIZE); - - // Allocate buffer - // bt->buf = malloc(node_size); - // if (!bt->buf) - // return ENOMEM; - - return 0; -} - -/** Intialize catalog btree, so that btree_close can safely be called. */ -void btree_reset(btree* bt) -{ - bt->cache.entries = NULL; -} - -/** Intialize catalog btree */ -int btree_init_cat(btree* bt, volume* vol, hfsp_fork_raw* fork) -{ - int result = btree_init(bt,vol,fork); // super (...) - bt->cnid = HFSP_CAT_CNID; - bt->kcomp = record_key_compare; - bt->kread = record_readkey; - return result; -} - -/** Intialize catalog btree */ -int btree_init_extent(btree* bt, volume* vol, hfsp_fork_raw* fork) -{ - int result = btree_init(bt,vol,fork); // super (...) - bt->cnid = HFSP_EXT_CNID; - bt->kcomp = record_extent_key_compare; - bt->kread = record_extent_readkey; - return result; -} - -/** close the btree and free any resources */ -void btree_close(btree* bt) -{ - node_cache_close(&bt->cache); - // free(bt->buf); -} - -/* returns pointer to key given by index in current node. - * - * Assumes that current node is not NODE_HEAD ... - */ -void* btree_key_by_index(btree* bt, node_buf* buf, UInt16 index) -{ - UInt16 node_size = bt->head.node_size; - // The offsets are found at the end of the node ... - UInt16 off_pos = node_size - (index +1) * sizeof(btree_record_offset); - // position of offset at end of node - btree_record_offset* offset = - (btree_record_offset*) (buf->node + off_pos); - - // now we have the offset and can read the key ... -#ifdef CONFIG_LITTLE_ENDIAN - return buf->node + bswabU16(*offset); -#else - return buf->node + *offset; -#endif -} - - -#ifdef DEBUG - -/* print btree header node information */ -void btree_printhead(btree_head* head) -{ - UInt32 attr; - printf(" depth : %#X\n", head->depth); - printf(" root : %#lX\n", head->root); - printf(" leaf_count : %#lX\n", head->leaf_count); - printf(" leaf_head : %#lX\n", head->leaf_head); - printf(" leaf_tail : %#lX\n", head->leaf_tail); - printf(" node_size : %#X\n", head->node_size); - printf(" max_key_len : %#X\n", head->max_key_len); - printf(" node_count : %#lX\n", head->node_count); - printf(" free_nodes : %#lX\n", head->free_nodes); - printf(" reserved1 : %#X\n", head->reserved1); - printf(" clump_size : %#lX\n", head->clump_size); - printf(" btree_type : %#X\n", head->btree_type); - attr = head->attributes; - printf(" reserved2 : %#X\n", head->reserved2); - if (attr & HFSPLUS_BAD_CLOSE) - printf(" HFSPLUS_BAD_CLOSE *** "); - else - printf(" !HFSPLUS_BAD_CLOSE"); - if (attr & HFSPLUS_TREE_BIGKEYS) - printf(" HFSPLUS_TREE_BIGKEYS "); - else - printf(" !HFSPLUS_TREE_BIGKEYS"); - if (attr & HFSPLUS_TREE_VAR_NDXKEY_SIZE) - printf(" HFSPLUS_TREE_VAR_NDXKEY_SIZE"); - else - printf(" !HFSPLUS_TREE_VAR_NDXKEY_SIZE"); - if (attr & HFSPLUS_TREE_UNUSED) - printf(" HFSPLUS_TREE_UNUSED ***\n"); - printf("\n"); -} - -/* Dump all the node information to stdout */ -void btree_print(btree* bt) -{ - btree_node_desc* node; - - btree_printhead(&bt->head); - - node = &bt->node; - printf("next : %#lX\n", node->next); - printf("prev : %#lX\n", node->prev); - printf("height : %#X\n", node->height); - printf("num_rec : %#X\n", node->num_rec); - printf("reserved : %#X\n", node->reserved); - printf("height : %#X\n", node->height); switch(node->kind) - { - case HFSP_NODE_NDX : - printf("HFSP_NODE_NDX\n"); - break; - case HFSP_NODE_HEAD : - printf("HFSP_NODE_HEAD\n"); - break; - case HFSP_NODE_MAP : - printf("HFSP_NODE_MAP\n"); - break; - case HFSP_NODE_LEAF : - printf("HFSP_NODE_LEAF\n"); - break; - default: - printf("*** Unknown Node type ***\n"); - } -} - -#endif diff --git a/fs/hfsplus/build.xml b/fs/hfsplus/build.xml index d3d32cb..f6f5369 100644 --- a/fs/hfsplus/build.xml +++ b/fs/hfsplus/build.xml @@ -1,11 +1,11 @@ <build> <library name="fs" type="static" target="target"> <object source="blockiter.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> - <object source="btree.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> + <object source="hfsp_btree.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> <object source="libhfsp.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> - <object source="record.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> + <object source="hfsp_record.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> <object source="unicode.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> - <object source="volume.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> + <object source="hfsp_volume.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> <object source="hfsp_fs.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> </library> </build> diff --git a/fs/hfsplus/hfsp_btree.c b/fs/hfsplus/hfsp_btree.c new file mode 100644 index 0000000..24eca92 --- /dev/null +++ b/fs/hfsplus/hfsp_btree.c @@ -0,0 +1,372 @@ +/* + * libhfs - library for reading and writing Macintosh HFS volumes + * The fucntions are used to handle the various forms of btrees + * found on HFS+ volumes. + * + * The fucntions are used to handle the various forms of btrees + * found on HFS+ volumes. + * + * Copyright (C) 2000 Klaus Halfmann <khalfmann(a)libra.de> + * Original 1996-1998 Robert Leslie <rob(a)mars.org> + * Additional work by Brad Boyer (flar(a)pants.nu) + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. + * + * $Id: btree.c,v 1.14 2000/10/25 05:43:04 hasi Exp $ + */ + +#include "config.h" +#include "libhfsp.h" +#include "volume.h" +#include "btree.h" +#include "record.h" +#include "swab.h" + +/* Read the node from the given buffer and swap the bytes. + * + * return pointer after reading the structure + */ +static void* btree_readnode(btree_node_desc* node, void *p) +{ + node->next = bswabU32_inc(p); + node->prev = bswabU32_inc(p); + node->kind = bswabU8_inc(p); + node->height = bswabU8_inc(p); + node->num_rec = bswabU16_inc(p); + node->reserved = bswabU16_inc(p); + return p; +} + +/* read a btree header from the given buffer and swap the bytes. + * + * return pointer after reading the structure + */ +static void* btree_readhead(btree_head* head, void *p) +{ + UInt32 *q; + head->depth = bswabU16_inc(p); + head->root = bswabU32_inc(p); + head->leaf_count = bswabU32_inc(p); + head->leaf_head = bswabU32_inc(p); + head->leaf_tail = bswabU32_inc(p); + head->node_size = bswabU16_inc(p); + head->max_key_len = bswabU16_inc(p); + head->node_count = bswabU32_inc(p); + head->free_nodes = bswabU32_inc(p); + head->reserved1 = bswabU16_inc(p); + head->clump_size = bswabU32_inc(p); + head->btree_type = bswabU8_inc(p); + head->reserved2 = bswabU8_inc(p); + head->attributes = bswabU32_inc(p); + // skip reserved bytes + q=((UInt32*) p); + // ((UInt32*) p) += 16; + q+=16; + return q; +} + +/* Priority of the depth of the node compared to LRU value. + * Should be the average number of keys per node but these vary. */ +#define DEPTH_FACTOR 1000 + +/* Cache size is height of tree + this value + * Really big numbers wont help in case of ls -R + */ +#define EXTRA_CACHESIZE 3 + +/* Not in use by now ... */ +#define CACHE_DIRTY 0x0001 + +/* Intialize cache with default cache Size, + * must call node_cache_close to deallocate memory */ +static int node_cache_init(node_cache* cache, btree* tree, int size) +{ + int nodebufsize; + char * buf; + + cache->size = size; + cache->currindex = 0; + nodebufsize = tree->head.node_size + sizeof(node_buf); + buf = malloc(size *(sizeof(node_entry) + nodebufsize)); + if (!buf) + return -1; + cache -> nodebufsize = nodebufsize; + cache -> entries = (node_entry*) buf; + cache -> buffers = (char*) &cache->entries[size]; + bzero(cache->entries, size*sizeof(node_entry)); + return 0; +} + +/* Like cache->buffers[i], since size of node_buf is variable */ +static inline node_buf* node_buf_get(node_cache* cache, int i) +{ + return (node_buf*) (cache->buffers + (i * cache->nodebufsize)); +} + +/* flush the node at index */ +static void node_cache_flush_node(node_cache* cache, int index) +{ + // NYI + cache -> entries[index].index = 0; // invalidate entry +} + +static void node_cache_close(node_cache* cache) +{ + if (!cache->entries) // not (fully) intialized ? + return; + free(cache->entries); +} + +/* Load the cach node indentified by index with + * the node identified by node_index */ + +static node_buf* node_cache_load_buf + (btree* bt, node_cache* cache, int index, UInt16 node_index) +{ + node_buf *result = node_buf_get(cache ,index); + UInt32 blkpernode = bt->blkpernode; + UInt32 block = node_index * blkpernode; + void* p = volume_readfromfork(bt->vol, result->node, bt->fork, + block, blkpernode, HFSP_EXTENT_DATA, bt->cnid); + node_entry *e = &cache->entries[index]; + + if (!p) + return NULL; // evil ... + + result->index = node_index; + btree_readnode(&result->desc, p); + + e -> priority = result->desc.height * DEPTH_FACTOR; + e -> index = node_index; + return result; +} + +/* Read node at given index, using cache. + */ +node_buf* btree_node_by_index(btree* bt, UInt16 index) +{ + node_cache* cache = &bt->cache; + int oldindex, lruindex; + int currindex = cache->currindex; + UInt32 prio; + node_entry *e; + + // Shortcut acces to current node, will not change priorities + if (cache->entries[currindex].index == index) + return node_buf_get(cache ,currindex); + oldindex = currindex; + if (currindex == 0) + currindex = cache->size; + currindex--; + lruindex = oldindex; // entry to be flushed when needed + prio = 0; // current priority + while (currindex != oldindex) // round robin + { + e = &cache->entries[currindex]; + if (e->index == index) // got it + { + if (e->priority != 0) // already top, uuh + e->priority--; + cache->currindex = currindex; + return node_buf_get(cache ,currindex); + } + else + { + if (!e->index) + { + lruindex = currindex; + break; // empty entry, load it + } + if (e->priority != UINT_MAX) // already least, uuh + e->priority++; + } + if (prio < e->priority) + { + lruindex = currindex; + prio = e->priority; + } + if (currindex == 0) + currindex = cache->size; + currindex--; + } + e = &cache->entries[lruindex]; + cache->currindex = lruindex; + if (e->flags & CACHE_DIRTY) + node_cache_flush_node( cache, lruindex); + return node_cache_load_buf (bt, cache, lruindex, index); +} + +/** intialize the btree with the first entry in the fork */ +static int btree_init(btree* bt, volume* vol, hfsp_fork_raw* fork) +{ + void *p; + char buf[vol->blksize]; + UInt16 node_size; + btree_node_desc node; + + bt->vol = vol; + bt->fork = fork; + p = volume_readfromfork(vol, buf, fork, 0, 1, + HFSP_EXTENT_DATA, bt->cnid); + if (!p) + return -1; + p = btree_readnode(&node, p); + if (node.kind != HFSP_NODE_HEAD) + return -1; // should not happen ? + btree_readhead(&bt->head, p); + + node_size = bt->head.node_size; + bt->blkpernode = node_size / vol->blksize; + + if (bt->blkpernode == 0 || vol->blksize * + bt->blkpernode != node_size) + return -1; // should never happen ... + + node_cache_init(&bt->cache, bt, bt->head.depth + EXTRA_CACHESIZE); + + // Allocate buffer + // bt->buf = malloc(node_size); + // if (!bt->buf) + // return ENOMEM; + + return 0; +} + +/** Intialize catalog btree, so that btree_close can safely be called. */ +void btree_reset(btree* bt) +{ + bt->cache.entries = NULL; +} + +/** Intialize catalog btree */ +int btree_init_cat(btree* bt, volume* vol, hfsp_fork_raw* fork) +{ + int result = btree_init(bt,vol,fork); // super (...) + bt->cnid = HFSP_CAT_CNID; + bt->kcomp = record_key_compare; + bt->kread = record_readkey; + return result; +} + +/** Intialize catalog btree */ +int btree_init_extent(btree* bt, volume* vol, hfsp_fork_raw* fork) +{ + int result = btree_init(bt,vol,fork); // super (...) + bt->cnid = HFSP_EXT_CNID; + bt->kcomp = record_extent_key_compare; + bt->kread = record_extent_readkey; + return result; +} + +/** close the btree and free any resources */ +void btree_close(btree* bt) +{ + node_cache_close(&bt->cache); + // free(bt->buf); +} + +/* returns pointer to key given by index in current node. + * + * Assumes that current node is not NODE_HEAD ... + */ +void* btree_key_by_index(btree* bt, node_buf* buf, UInt16 index) +{ + UInt16 node_size = bt->head.node_size; + // The offsets are found at the end of the node ... + UInt16 off_pos = node_size - (index +1) * sizeof(btree_record_offset); + // position of offset at end of node + btree_record_offset* offset = + (btree_record_offset*) (buf->node + off_pos); + + // now we have the offset and can read the key ... +#ifdef CONFIG_LITTLE_ENDIAN + return buf->node + bswabU16(*offset); +#else + return buf->node + *offset; +#endif +} + + +#ifdef DEBUG + +/* print btree header node information */ +void btree_printhead(btree_head* head) +{ + UInt32 attr; + printf(" depth : %#X\n", head->depth); + printf(" root : %#lX\n", head->root); + printf(" leaf_count : %#lX\n", head->leaf_count); + printf(" leaf_head : %#lX\n", head->leaf_head); + printf(" leaf_tail : %#lX\n", head->leaf_tail); + printf(" node_size : %#X\n", head->node_size); + printf(" max_key_len : %#X\n", head->max_key_len); + printf(" node_count : %#lX\n", head->node_count); + printf(" free_nodes : %#lX\n", head->free_nodes); + printf(" reserved1 : %#X\n", head->reserved1); + printf(" clump_size : %#lX\n", head->clump_size); + printf(" btree_type : %#X\n", head->btree_type); + attr = head->attributes; + printf(" reserved2 : %#X\n", head->reserved2); + if (attr & HFSPLUS_BAD_CLOSE) + printf(" HFSPLUS_BAD_CLOSE *** "); + else + printf(" !HFSPLUS_BAD_CLOSE"); + if (attr & HFSPLUS_TREE_BIGKEYS) + printf(" HFSPLUS_TREE_BIGKEYS "); + else + printf(" !HFSPLUS_TREE_BIGKEYS"); + if (attr & HFSPLUS_TREE_VAR_NDXKEY_SIZE) + printf(" HFSPLUS_TREE_VAR_NDXKEY_SIZE"); + else + printf(" !HFSPLUS_TREE_VAR_NDXKEY_SIZE"); + if (attr & HFSPLUS_TREE_UNUSED) + printf(" HFSPLUS_TREE_UNUSED ***\n"); + printf("\n"); +} + +/* Dump all the node information to stdout */ +void btree_print(btree* bt) +{ + btree_node_desc* node; + + btree_printhead(&bt->head); + + node = &bt->node; + printf("next : %#lX\n", node->next); + printf("prev : %#lX\n", node->prev); + printf("height : %#X\n", node->height); + printf("num_rec : %#X\n", node->num_rec); + printf("reserved : %#X\n", node->reserved); + printf("height : %#X\n", node->height); switch(node->kind) + { + case HFSP_NODE_NDX : + printf("HFSP_NODE_NDX\n"); + break; + case HFSP_NODE_HEAD : + printf("HFSP_NODE_HEAD\n"); + break; + case HFSP_NODE_MAP : + printf("HFSP_NODE_MAP\n"); + break; + case HFSP_NODE_LEAF : + printf("HFSP_NODE_LEAF\n"); + break; + default: + printf("*** Unknown Node type ***\n"); + } +} + +#endif diff --git a/fs/hfsplus/hfsp_record.c b/fs/hfsplus/hfsp_record.c new file mode 100644 index 0000000..d4e7af1 --- /dev/null +++ b/fs/hfsplus/hfsp_record.c @@ -0,0 +1,759 @@ +/* + * libhfsp - library for reading and writing Macintosh HFS+ volumes. + * + * a record contains a key and a folder or file and is part + * of a btree. + * + * Copyright (C) 2000 Klaus Halfmann <khalfmann(a)libra.de> + * Original 1996-1998 Robert Leslie <rob(a)mars.org> + * Additional work by Brad Boyer (flar(a)pants.nu) + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. + * + * $Id: record.c,v 1.24 2000/10/17 05:58:46 hasi Exp $ + */ + +#include "config.h" +#include "libhfsp.h" +#include "hfstime.h" +#include "record.h" +#include "volume.h" +#include "btree.h" +#include "unicode.h" +#include "swab.h" + +/* read a hfsp_cat_key from memory */ +void* record_readkey(void* p, void* buf) +{ + hfsp_cat_key* key = (hfsp_cat_key*) buf; + const void* check; + UInt16 key_length, len,i; + UInt16* cp; + + key->key_length = key_length = bswabU16_inc(p); + check = p; + key->parent_cnid = bswabU32_inc(p); + key->name.strlen = len = bswabU16_inc(p); + cp = key->name.name; + for (i=0; i < len; i++, cp++) + *cp = bswabU16_inc(p); + /* check if keylenght was correct */ + if (key_length != ((char*) p) - ((char*) check)) + HFSP_ERROR(EINVAL, "Invalid key length in record_readkey"); + return p; + fail: + return NULL; +} + +/* read a hfsp_extent_key from memory */ +void* record_extent_readkey(void* p, void* buf) +{ + hfsp_extent_key* key = (hfsp_extent_key*) buf; + UInt16 key_length; + + key->key_length = key_length = bswabU16_inc(p); + key->fork_type = bswabU8_inc(p); + key->filler = bswabU8_inc(p); + if (key_length != 10) + HFSP_ERROR(-1, "Invalid key length in record_extent_readkey"); + key->file_id = bswabU32_inc(p); + key->start_block = bswabU32_inc(p); + return p; + fail: + return NULL; +} + + +/* read posix permission from memory */ +static inline void* record_readperm(void *p, hfsp_perm* perm) +{ + perm->owner= bswabU32_inc(p); + perm->group= bswabU32_inc(p); + perm->mode = bswabU32_inc(p); + perm->dev = bswabU32_inc(p); + return p; +} + +/* read directory info */ +static inline void* record_readDInfo(void *p, DInfo* info) +{ + info->frRect.top = bswabU16_inc(p); + info->frRect.left = bswabU16_inc(p); + info->frRect.bottom = bswabU16_inc(p); + info->frRect.right = bswabU16_inc(p); + info->frFlags = bswabU16_inc(p); + info->frLocation.v = bswabU16_inc(p); + info->frLocation.h = bswabU16_inc(p); + info->frView = bswabU16_inc(p); + return p; +} + +/* read extra Directory info */ +static inline void* record_readDXInfo(void *p, DXInfo* xinfo) +{ + xinfo->frScroll.v = bswabU16_inc(p); + xinfo->frScroll.h = bswabU16_inc(p); + xinfo->frOpenChain = bswabU32_inc(p); + xinfo->frUnused = bswabU16_inc(p); + xinfo->frComment = bswabU16_inc(p); + xinfo->frPutAway = bswabU32_inc(p); + return p; +} + +/* read a hfsp_cat_folder from memory */ +static void* record_readfolder(void *p, hfsp_cat_folder* folder) +{ + folder->flags = bswabU16_inc(p); + folder->valence = bswabU32_inc(p); + folder->id = bswabU32_inc(p); + folder->create_date = bswabU32_inc(p); + folder->content_mod_date = bswabU32_inc(p); + folder->attribute_mod_date = bswabU32_inc(p); + folder->access_date = bswabU32_inc(p); + folder->backup_date = bswabU32_inc(p); + p = record_readperm (p, &folder->permissions); + p = record_readDInfo (p, &folder->user_info); + p = record_readDXInfo (p, &folder->finder_info); + folder->text_encoding = bswabU32_inc(p); + folder->reserved = bswabU32_inc(p); + return p; +} + +/* read file info */ +static inline void* record_readFInfo(void *p, FInfo* info) +{ + info->fdType = bswabU32_inc(p); + info->fdCreator = bswabU32_inc(p); + info->fdFlags = bswabU16_inc(p); + info->fdLocation.v = bswabU16_inc(p); + info->fdLocation.h = bswabU16_inc(p); + info->fdFldr = bswabU16_inc(p); + return p; +} + +/* read extra File info */ +static inline void* record_readFXInfo(void *p, FXInfo* xinfo) +{ + SInt16 *q; + xinfo->fdIconID = bswabU16_inc(p); + q=(SInt16*) p; + q+=4; // skip unused + p=(void *)q; + xinfo->fdComment = bswabU16_inc(p); + xinfo->fdPutAway = bswabU32_inc(p); + return p; +} + +/* read a hfsp_cat_file from memory */ +static void* record_readfile(void *p, hfsp_cat_file* file) +{ + file->flags = bswabU16_inc(p); + file->reserved1 = bswabU32_inc(p); + file->id = bswabU32_inc(p); + file->create_date = bswabU32_inc(p); + file->content_mod_date = bswabU32_inc(p); + file->attribute_mod_date = bswabU32_inc(p); + file->access_date = bswabU32_inc(p); + file->backup_date = bswabU32_inc(p); + p = record_readperm (p, &file->permissions); + p = record_readFInfo (p, &file->user_info); + p = record_readFXInfo (p, &file->finder_info); + file->text_encoding = bswabU32_inc(p); + file->reserved2 = bswabU32_inc(p); + p = volume_readfork (p, &file->data_fork); + return volume_readfork (p, &file->res_fork); +} + +/* read a hfsp_cat_thread from memory */ +static void* record_readthread(void *p, hfsp_cat_thread* entry) +{ + int i; + UInt16 len; + UInt16* cp; + + entry-> reserved = bswabU16_inc(p); + entry-> parentID = bswabU32_inc(p); + entry->nodeName.strlen = len= bswabU16_inc(p); + cp = entry->nodeName.name; + if (len > 255) + HFSP_ERROR(-1, "Invalid key length in record thread"); + for (i=0; i < len; i++, cp++) + *cp = bswabU16_inc(p); + return p; + fail: + return NULL; +} + +/* read a hfsp_cat_entry from memory */ +static void* record_readentry(void *p, hfsp_cat_entry* entry) +{ + UInt16 type = bswabU16_inc(p); + entry->type = type; + switch (type) + { + case HFSP_FOLDER: + return record_readfolder(p, &entry->u.folder); + case HFSP_FILE: + return record_readfile (p, &entry->u.file); + case HFSP_FOLDER_THREAD: + case HFSP_FILE_THREAD: + return record_readthread(p, &entry->u.thread); + default: + HFSP_ERROR(-1, "Unexpected record type in record_readentry"); + } ; + fail: + return NULL; +} + + +/* Most of the functions here will not change the node in the btree, + But this must be changed in the future ... */ + + +/* intialize the record with the given index entry in the btree. */ +static int record_init(record* r, btree* bt, node_buf* buf, UInt16 index) +{ + void *p; + r-> tree = bt; + p = btree_key_by_index(bt,buf,index); + if (!p) + return -1; + p = record_readkey (p, &r->key); + if (!p) + return -1; + p = record_readentry(p, &r->record); + if (!p) + return -1; + r->node_index = buf->index; + r-> keyind = index; + + return 0; +} + +/* intialize the record with the given index entry in the btree. */ +static int record_init_extent(extent_record* r, btree* bt, node_buf* buf, UInt16 index) +{ + void *p; + r-> tree = bt; + p = btree_key_by_index(bt, buf,index); + if (!p) + return -1; + p = record_extent_readkey(p, &r->key); + if (!p) + return -1; + p = volume_readextent(p, r->extent); + if (!p) + return -1; + r->node_index = buf->index; + r-> keyind = index; + + return 0; +} + +/* intialize the record to the first record of the tree + * which is (per design) the root node. + */ +int record_init_root(record* r, btree* tree) +{ + // Position to first leaf node ... + UInt32 leaf_head = tree->head.leaf_head; + node_buf* buf = btree_node_by_index(tree, leaf_head); + if (!buf) + return -1; + return record_init(r, tree, buf, 0); +} + +/* Compare two cat_keys ... */ +int record_key_compare(void* k1, void* k2) +{ + hfsp_cat_key* key1 = (hfsp_cat_key*) k1; + hfsp_cat_key* key2 = (hfsp_cat_key*) k2; + int diff = key2->parent_cnid - key1->parent_cnid; + if (!diff) // same parent + diff = fast_unicode_compare(&key1->name, &key2->name); + return diff; +} + +/* Compare two extent_keys ... */ +int record_extent_key_compare(void* k1, void* k2) +{ + hfsp_extent_key* key1 = (hfsp_extent_key*) k1; + hfsp_extent_key* key2 = (hfsp_extent_key*) k2; + int diff = key2->fork_type - key1->fork_type; + if (!diff) // same type + { + diff = key2->file_id - key1->file_id; + if (!diff) // same file + diff = key2->start_block - key1->start_block; + } + return diff; +} + +/* Position node in btree so that key might be inside */ +static node_buf* record_find_node(btree* tree, void *key) +{ + int start, end, mid, comp; // components of a binary search + void *p = NULL; + char curr_key[tree->head.max_key_len]; + // The current key under examination + hfsp_key_read readkey = tree->kread; + hfsp_key_compare key_compare = tree->kcomp; + UInt32 index; + node_buf* node = btree_node_by_index(tree, tree->head.root); + if (!node) + HFSP_ERROR(-1, "record_find_node: Cant position to root node"); + while (node->desc.kind == HFSP_NODE_NDX) + { + mid = start = 0; + end = node->desc.num_rec; + comp = -1; + while (start < end) + { + mid = (start + end) >> 1; + p = btree_key_by_index(tree, node, mid); + if (!p) + HFSP_ERROR(-1, "record_find_node: unexpected error"); + p = readkey (p, curr_key); + if (!p) + HFSP_ERROR(-1, "record_find_node: unexpected error"); + comp = key_compare(curr_key, key); + if (comp > 0) + start = mid + 1; + else if (comp < 0) + end = mid; + else + break; + } + if (!p) // Empty tree, fascinating ... + HFSP_ERROR(-1, "record_find_node: unexpected empty node"); + if (comp < 0) // mmh interesting key is before this key ... + { + if (mid == 0) + return NULL; // nothing before this key .. + p = btree_key_by_index(tree, node, mid-1); + if (!p) + HFSP_ERROR(-1, "record_find_node: unexpected error"); + p = readkey (p, curr_key); + if (!p) + HFSP_ERROR(-1, "record_find_node: unexpected error"); + } + + index = bswabU32_inc(p); + node = btree_node_by_index(tree, index); + } + return node; // go on and use the found node + fail: + return NULL; +} + +/* search for the given key in the btree. + * + * returns pointer to memory just after key or NULL + * In any case *keyind recives the index where the + * key was found (or could be inserted.) + */ +static void * +record_find_key(btree* tree, void* key, int* keyind, UInt16* node_index) +{ + node_buf* buf = record_find_node(tree, key); + if (buf) + { + int comp = -1; + int start = 0; // components of a binary search + int end = buf->desc.num_rec; + int mid = -1; + void *p = NULL; + char curr_key[tree->head.max_key_len]; + hfsp_key_read readkey = tree->kread; + hfsp_key_compare key_compare = tree->kcomp; + while (start < end) + { + mid = (start + end) >> 1; + p = btree_key_by_index(tree, buf, mid); + if (!p) + HFSP_ERROR(-1, "record_init_key: unexpected error"); + p = readkey (p, curr_key); + if (!p) + HFSP_ERROR(-1, "record_init_cat_key: unexpected error"); + comp = key_compare(curr_key, key); + if (comp > 0) + start = mid + 1; + else if (comp < 0) + end = mid; + else + break; + } + if (!p) // Empty tree, fascinating ... + HFSP_ERROR(ENOENT, "record_init_key: unexpected empty node"); + *keyind = mid; + *node_index = buf->index; + if (!comp) // found something ... + return p; + } + HFSP_ERROR(ENOENT, NULL); + fail: + return NULL; +} + +/* intialize the record by searching for the given key in the btree. + * + * r is umodified on error. + */ +static int +record_init_key(record* r, btree* tree, hfsp_cat_key* key) +{ + int keyind; + UInt16 node_index; + void *p = record_find_key(tree, key, &keyind, &node_index); + + if (p) + { + r -> tree = tree; + r -> node_index= node_index; + r -> keyind = keyind; + r -> key = *key; // Better use a record_key_copy ... + p = record_readentry(p, &r->record); + if (!p) + HFSP_ERROR(-1, "record_init_key: unexpected error"); + return 0; + } + fail: + return -1; +} + +/* intialize the extent_record to the extent identified by the + * (first) blockindex. + * + * forktype: either HFSP_EXTEND_DATA or HFSP_EXTEND_RSRC + */ +int record_init_file(extent_record* r, btree* tree, + UInt8 forktype, UInt32 fileId, UInt32 blockindex) +{ + int keyind; + UInt16 node_index; + hfsp_extent_key key = { 10, forktype, 0, fileId, blockindex }; + void *p = record_find_key(tree, &key, &keyind, &node_index); + + if (p) + { + r -> tree = tree; + r -> node_index= node_index; + r -> keyind = keyind; + r -> key = key; // Better use a record_key_copy ... + p = volume_readextent(p, r->extent); + if (!p) + HFSP_ERROR(-1, "record_init_file: unexpected error"); + return 0; + } + fail: + return -1; +} + +/* intialize the record to the folder identified by cnid + */ +int record_init_cnid(record* r, btree* tree, UInt32 cnid) +{ + hfsp_cat_key thread_key; // the thread is the first record + + thread_key.key_length = 6; // null name (like '.' in unix ) + thread_key.parent_cnid = cnid; + thread_key.name.strlen = 0; + + return record_init_key(r, tree, &thread_key); +} + +/* intialize the record to the first record of the parent. + */ +int record_init_parent(record* r, record* parent) +{ + if (parent->record.type == HFSP_FOLDER) + return record_init_cnid(r, parent->tree, parent->record.u.folder.id); + else if(parent->record.type == HFSP_FOLDER_THREAD) + { + if (r != parent) + *r = *parent; // The folder thread is in fact the first entry, like '.' + return 0; + } + HFSP_ERROR(EINVAL, + "record_init_parent: parent is neither folder nor folder thread."); + + fail: + return EINVAL; +} + + +/* find correct node record for given node and *pindex. + * + * index of record in this (or next) node + * */ +static node_buf* prepare_next(btree* tree, UInt16 node_index, UInt16* pindex) +{ + node_buf* buf = btree_node_by_index(tree, node_index); + btree_node_desc* desc = &buf->desc; + UInt32 numrec = desc->num_rec; + if (*pindex >= numrec) // move on to next node + { + UInt16 next = desc->next; + *pindex = 0; + if (!next /* is there a next node ? */ + || !( buf = btree_node_by_index(tree, next))) + return NULL; + } + return buf; +} +/* move record foreward to next entry. + * + * In case of an error the value of *r is undefined ! + */ +int record_next(record* r) +{ + btree* tree = r->tree; + UInt16 index = r->keyind +1; + UInt32 parent; + node_buf* buf = prepare_next(tree, r->node_index, &index); + + if (!buf) + return ENOENT; // No (more) such file or directory + + parent = r->key.parent_cnid; + + if (record_init(r, tree, buf, index)) + return -1; + + if (r->key.parent_cnid != parent || // end of current directory + index != r->keyind) // internal error ? + return ENOENT; // No (more) such file or directory + + return 0; +} + +/* move record foreward to next extent record. + * + * In case of an error the value of *r is undefined ! + */ +int record_next_extent(extent_record* r) +{ + btree* tree = r->tree; + UInt16 index = r->keyind +1; + UInt32 file_id; + UInt8 fork_type; + node_buf* buf = prepare_next(tree, r->node_index, &index); + + if (!buf) + return ENOENT; // No (more) such file or directory + + file_id = r->key.file_id; + fork_type = r->key.fork_type; + + if (record_init_extent(r, tree, buf, index)) + return -1; + + if (r->key.file_id != file_id || // end of current file + r->key.fork_type != fork_type || // end of current fork + index != r->keyind) // internal error ? + return ENOENT; // No (more) such file or directory + + return 0; +} + +/* intialize the record by searching for the given string in the given folder. + * + * parent and r may be the same. + */ +int record_init_string_parent(record* r, record* parent, char* name) +{ + hfsp_cat_key key; + + if (parent->record.type == HFSP_FOLDER) + key.parent_cnid = parent->record.u.folder.id; + else if(parent->record.type == HFSP_FOLDER_THREAD) + key.parent_cnid = parent->key.parent_cnid; + else + HFSP_ERROR(-1, "record_init_string_parent: parent is not a folder."); + + key.key_length = 6 + unicode_asc2uni(&key.name,name); // 6 for minumum size + return record_init_key(r, parent->tree, &key); + + fail: + return -1; +} + +/* move record up in folder hierarchy (if possible) */ +int record_up(record* r) +{ + if (r->record.type == HFSP_FOLDER) + { + // locate folder thread + if (record_init_cnid(r, r->tree, r->record.u.folder.id)) + return -1; + } + else if(r->record.type == HFSP_FOLDER_THREAD) + { + // do nothing were are already where we want to be + } + else + HFSP_ERROR(-1, "record_up: record is neither folder nor folder thread."); + + if(r->record.type != HFSP_FOLDER_THREAD) + HFSP_ERROR(-1, "record_up: unable to locate parent"); + return record_init_cnid(r, r->tree, r->record.u.thread.parentID); + + fail: + return -1; +} + +#ifdef DEBUG + +/* print Quickdraw Point */ +static void record_print_Point(Point* p) +{ + printf("[ v=%d, h=%d ]", p->v, p->h); +} + +/* print Quickdraw Rect */ +static void record_print_Rect(Rect* r) +{ + printf("[ top=%d, left=%d, bottom=%d, right=%d ]", + r->top, r->left, r->bottom, r->right); +} + +/* print the key of a record */ +static void record_print_key(hfsp_cat_key* key) +{ + char buf[255]; // mh this _might_ overflow + unicode_uni2asc(buf, &key->name, 255); + printf("parent cnid : %ld\n", key->parent_cnid); + printf("name : %s\n", buf); +} + +/* print permissions */ +static void record_print_perm(hfsp_perm* perm) +{ + printf("owner :\t%ld\n", perm->owner); + printf("group :\t%ld\n", perm->group); + printf("perm :\t0x%lX\n",perm->mode); + printf("dev :\t%ld\n", perm->dev); +} + +/* print Directory info */ +static void record_print_DInfo(DInfo* dinfo) +{ + printf( "frRect :\t"); record_print_Rect(&dinfo->frRect); + printf("\nfrFlags :\t0X%X\n", dinfo->frFlags); + printf( "frLocation :\t"); record_print_Point(&dinfo->frLocation); + printf("\nfrView :\t0X%X\n", dinfo->frView); +} + +/* print extended Directory info */ +static void record_print_DXInfo(DXInfo* xinfo) +{ + printf( "frScroll :\t"); record_print_Point(&xinfo->frScroll); + printf("\nfrOpenChain :\t%ld\n", xinfo->frOpenChain); + printf( "frUnused :\t%d\n", xinfo->frUnused); + printf( "frComment :\t%d\n", xinfo->frComment); + printf( "frPutAway :\t%ld\n", xinfo->frPutAway); +} + +static void record_print_folder(hfsp_cat_folder* folder) +{ + printf("flags :\t0x%X\n", folder->flags); + printf("valence :\t0x%lX\n", folder->valence); + printf("id :\t%ld\n", folder->id); + record_print_perm (&folder->permissions); + record_print_DInfo (&folder->user_info); + record_print_DXInfo (&folder->finder_info); + printf("text_encoding :\t0x%lX\n", folder->text_encoding); + printf("reserved :\t0x%lX\n", folder->reserved); +} + +/* print File info */ +static void record_print_FInfo(FInfo* finfo) +{ + printf( "fdType :\t%4.4s\n", (char*) &finfo->fdType); + printf( "fdCreator :\t%4.4s\n", (char*) &finfo->fdCreator); + printf( "fdFlags :\t0X%X\n", finfo->fdFlags); + printf( "fdLocation :\t"); record_print_Point(&finfo->fdLocation); + printf("\nfdFldr :\t%d\n", finfo->fdFldr); +} + +/* print extended File info */ +static void record_print_FXInfo(FXInfo* xinfo) +{ + printf( "fdIconID :\t%d\n", xinfo->fdIconID); + // xinfo -> fdUnused; + printf( "fdComment :\t%d\n", xinfo->fdComment); + printf( "fdPutAway :\t%ld\n", xinfo->fdPutAway); +} + +/* print folder entry */ + +/* print file entry */ +static void record_print_file(hfsp_cat_file* file) +{ + printf("flags :\t0x%X\n", file->flags); + printf("reserved1 :\t0x%lX\n", file->reserved1); + printf("id :\t%ld\n", file->id); + record_print_perm (&file->permissions); + record_print_FInfo (&file->user_info); + record_print_FXInfo (&file->finder_info); + printf("text_encoding :\t0x%lX\n", file->text_encoding); + printf("reserved :\t0x%lX\n", file->reserved2); + printf("Datafork:\n"); + volume_print_fork (&file->data_fork); + printf("Rsrcfork:\n"); + volume_print_fork (&file->res_fork); +} + +/* print info for a file or folder thread */ +static void record_print_thread(hfsp_cat_thread* entry) +{ + char buf[255]; // mh this _might_ overflow + unicode_uni2asc(buf, &entry->nodeName, 255); + printf("parent cnid :\t%ld\n", entry->parentID); + printf("name :\t%s\n" , buf); +} + +/* print the information for a record */ +static void record_print_entry(hfsp_cat_entry* entry) +{ + switch (entry->type) + { + case HFSP_FOLDER: + printf("=== Folder ===\n"); + return record_print_folder(&entry->u.folder); + case HFSP_FILE: + printf("=== File ===\n"); + return record_print_file (&entry->u.file); + case HFSP_FOLDER_THREAD: + printf("=== Folder Thread ===\n"); + return record_print_thread(&entry->u.thread); + case HFSP_FILE_THREAD: + printf("=== File Thread ==\n"); + return record_print_thread(&entry->u.thread); + default: + printf("=== Unknown Record Type ===\n"); + } ; +} + + /* Dump all the record information to stdout */ +void record_print(record* r) +{ + printf ("keyind : %u\n", r->keyind); + record_print_key (&r->key); + record_print_entry(&r->record); +} + +#endif diff --git a/fs/hfsplus/hfsp_volume.c b/fs/hfsplus/hfsp_volume.c new file mode 100644 index 0000000..802d700 --- /dev/null +++ b/fs/hfsplus/hfsp_volume.c @@ -0,0 +1,314 @@ +/* + * libhfs - library for reading and writing Macintosh HFS volumes + * + * Code to acces the basic volume information of a HFS+ volume. + * + * Copyright (C) 2000 Klaus Halfmann <khalfmann(a)libra.de> + * Original work by 1996-1998 Robert Leslie <rob(a)mars.org> + * other work 2000 from Brad Boyer (flar(a)pants.nu) + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. + * + * $Id: volume.c,v 1.21 2000/10/25 05:43:04 hasi Exp $ + */ + +#include "config.h" +#include "libhfsp.h" +#include "volume.h" +#include "record.h" +#include "btree.h" +#include "blockiter.h" +#include "os.h" +#include "swab.h" +#include "hfstime.h" + + +/* Fill a given buffer with the given block in volume. + */ +int +volume_readinbuf(volume * vol,void* buf, long block) +{ + UInt16 blksize_bits; + ASSERT( block < vol->maxblocks); + + blksize_bits = vol->blksize_bits; + block += vol->startblock; + if( os_seek(vol->os_fd, block, blksize_bits) == block) + if( 1 == os_read(vol->os_fd, buf, 1, blksize_bits)) + return 0; + return -1; +} + +/* read multiple blocks into given memory. + * + * returns given pinter or NULL on failure. + */ +void* +volume_readfromfork(volume* vol, void* buf, + hfsp_fork_raw* f, UInt32 block, + UInt32 count, UInt8 forktype, UInt32 fileId) +{ + blockiter iter; + char *cbuf = buf; + + blockiter_init(&iter, vol, f, forktype, fileId); + if( blockiter_skip(&iter, block)) + return NULL; + + while( count > 0) { + --count; + if( volume_readinbuf(vol, cbuf, blockiter_curr(&iter))) + return NULL; + cbuf += vol->blksize; + if( count > 0 && blockiter_next(&iter)) + return NULL; + } + return buf; +} + + +/* Read a raw hfsp_extent_rec from memory. + * + * return pointer right after the structure. + */ +void* +volume_readextent(void *p, hfsp_extent_rec er) +{ + int i; + hfsp_extent *e; + + for( i=0; i < 8; i++) { + e = &er[i]; + e->start_block = bswabU32_inc(p); + e->block_count = bswabU32_inc(p); + } + return p; +} + +/* Read a raw hfsp_fork from memory. + * + * return pointer right after the structure. + */ +void* +volume_readfork(void *p, hfsp_fork_raw* f) +{ + f->total_size = bswabU64_inc(p); + f->clump_size = bswabU32_inc(p); + f->total_blocks = bswabU32_inc(p); + + return volume_readextent(p, f->extents); +} + +/* Read the volume from the given buffer and swap the bytes. + * + * ToDo: add more consitency checks. + */ +static int +volume_readbuf(hfsp_vh* vh, char * p) +{ + if( (vh->signature = bswabU16_inc(p)) != HFSP_VOLHEAD_SIG) + HFSP_ERROR(-1, "This is not a HFS+ volume"); + + vh->version = bswabU16_inc(p); + vh->attributes = bswabU32_inc(p); + vh->last_mount_vers = bswabU32_inc(p); + vh->reserved = bswabU32_inc(p); + vh->create_date = bswabU32_inc(p); + vh->modify_date = bswabU32_inc(p); + vh->backup_date = bswabU32_inc(p); + vh->checked_date = bswabU32_inc(p); + vh->file_count = bswabU32_inc(p); + vh->folder_count = bswabU32_inc(p); + vh->blocksize = bswabU32_inc(p); + vh->total_blocks = bswabU32_inc(p); + vh->free_blocks = bswabU32_inc(p); + vh->next_alloc = bswabU32_inc(p); + vh->rsrc_clump_sz = bswabU32_inc(p); + vh->data_clump_sz = bswabU32_inc(p); + vh->next_cnid = bswabU32_inc(p); + vh->write_count = bswabU32_inc(p); + vh->encodings_bmp = bswabU64_inc(p); + memcpy(vh->finder_info, p, 32); + p += 32; // So finderinfo must be swapped later, *** + p = volume_readfork(p, &vh->alloc_file ); + p = volume_readfork(p, &vh->ext_file ); + p = volume_readfork(p, &vh->cat_file ); + p = volume_readfork(p, &vh->attr_file ); + volume_readfork(p, &vh->start_file ); + return 0; + fail: + return -1; +} + +/* Read the volume from the given block */ +static int +volume_read(volume * vol, hfsp_vh* vh, UInt32 block) +{ + char buf[vol->blksize]; + + if( volume_readinbuf(vol, buf, block)) + return -1; + return volume_readbuf(vh, buf); +} + +/* Find out wether the volume is wrapped and unwrap it eventually */ +static int +volume_read_wrapper(volume * vol, hfsp_vh* vh) +{ + UInt16 signature; + char buf[vol->blksize]; + char *p = buf; + + if( volume_readinbuf(vol, buf, 2) ) // Wrapper or volume header starts here + return -1; + + signature = bswabU16_inc(p); + if( signature == HFS_VOLHEAD_SIG) { /* Wrapper */ + UInt32 drAlBlkSiz; /* size (in bytes) of allocation blocks */ + UInt32 sect_per_block; /* how may block build an hfs sector */ + UInt16 drAlBlSt; /* first allocation block in volume */ + UInt16 embeds, embedl; /* Start/lenght of embedded area in blocks */ + + p += 0x12; /* skip unneded HFS vol fields */ + drAlBlkSiz = bswabU32_inc(p); /* offset 0x14 */ + p += 0x4; /* skip unneded HFS vol fields */ + drAlBlSt = bswabU16_inc(p); /* offset 0x1C */ + + p += 0x5E; /* skip unneded HFS vol fields */ + signature = bswabU16_inc(p); /* offset 0x7C, drEmbedSigWord */ + if( signature != HFSP_VOLHEAD_SIG) + HFSP_ERROR(-1, "This looks like a normal HFS volume"); + embeds = bswabU16_inc(p); + embedl = bswabU16_inc(p); + sect_per_block = (drAlBlkSiz / HFSP_BLOCKSZ); + // end is absolute (not relative to HFS+ start) + vol->maxblocks = embedl * sect_per_block; + vol->startblock = drAlBlSt + embeds * sect_per_block; + /* Now we can try to read the embedded HFS+ volume header */ + return volume_read(vol,vh,2); + } + else if( signature == HFSP_VOLHEAD_SIG) { /* Native HFS+ volume */ + p = buf; // Restore to begin of block + return volume_readbuf(vh, p); + } else + HFSP_ERROR(-1, "Neither Wrapper nor native HFS+ volume header found"); +fail: + return -1; +} + + +/* Open the device, read and verify the volume header + (and its backup) */ +int +volume_open( volume* vol, int os_fd ) +{ + hfsp_vh backup; /* backup volume found at second to last block */ + long sect_per_block; + int shift; + + vol->blksize_bits = HFSP_BLOCKSZ_BITS; + vol->blksize = HFSP_BLOCKSZ; + vol->startblock = 0; + vol->maxblocks = 3; + /* this should be enough until we find the volume descriptor */ + vol->extents = NULL; /* Thanks to Jeremias Sauceda */ + + btree_reset(&vol->catalog); + vol->os_fd = os_fd; + + // vol->maxblocks = os_seek(vol->os_fd, -1, HFSP_BLOCKSZ_BITS); + // This wont work for /dev/... but we do not really need it + + if( volume_read_wrapper(vol, &vol->vol)) + return -1; + if( volume_read(vol, &backup, vol->maxblocks - 2)) + return -1; + + /* Now switch blksize from HFSP_BLOCKSZ (512) to value given in header + and adjust depend values accordingly, after that a block always + means a HFS+ allocation size */ + + /* Usually 4096 / 512 == 8 */ + sect_per_block = vol->vol.blocksize / HFSP_BLOCKSZ; + shift = 0; + if( sect_per_block > 1) { + shift = 1; + while( sect_per_block > 2) { + sect_per_block >>=1; + shift++; + } /* shift = 3 */ + } + vol -> blksize_bits += shift; + vol -> blksize = 1 << vol->blksize_bits; + vol -> startblock >>= shift; + vol -> maxblocks = vol->vol.total_blocks; /* cant calculate via shift ? */ + + if( btree_init_cat(&vol->catalog, vol, &vol->vol.cat_file)) + return -1; + + return 0; +} + +/* Write back all data eventually cached and close the device */ +int +volume_close(volume* vol) +{ + btree_close(&vol->catalog); + if( vol->extents) { + btree_close(vol->extents); + FREE(vol->extents); + } + return 0; +} + +/* internal fucntion used to create the extents btree, + is called by inline function when needed */ +void +volume_create_extents_tree(volume* vol) +{ + btree* result = (btree*) ALLOC(btree*, sizeof(btree)); + if( !result) + HFSP_ERROR(ENOMEM, "No memory for extents btree"); + if( !btree_init_extent(result, vol, &vol->vol.ext_file)) { + vol->extents = result; + return; + } + fail: + vol->extents = NULL; +} + +/* Determine whether the volume is a HFS-plus volume */ +int +volume_probe(int fd, long long offset) +{ + UInt16 *vol; + int ret = 0; + + vol = (UInt16 *)malloc(2 * 1 << HFSP_BLOCKSZ_BITS); + os_seek_offset( fd, 2 * (1 << HFSP_BLOCKSZ_BITS) + offset ); + os_read(fd, vol, 2, HFSP_BLOCKSZ_BITS); + + if (__be16_to_cpu(vol[0]) == HFS_VOLHEAD_SIG && + __be16_to_cpu(vol[0x7c]) == HFSP_VOLHEAD_SIG) { + ret = -1; + } else if (__be16_to_cpu(vol[0]) == HFSP_VOLHEAD_SIG) { + ret = -1; + } + + free(vol); + return ret; +} + diff --git a/fs/hfsplus/record.c b/fs/hfsplus/record.c deleted file mode 100644 index d4e7af1..0000000 --- a/fs/hfsplus/record.c +++ /dev/null @@ -1,759 +0,0 @@ -/* - * libhfsp - library for reading and writing Macintosh HFS+ volumes. - * - * a record contains a key and a folder or file and is part - * of a btree. - * - * Copyright (C) 2000 Klaus Halfmann <khalfmann(a)libra.de> - * Original 1996-1998 Robert Leslie <rob(a)mars.org> - * Additional work by Brad Boyer (flar(a)pants.nu) - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, - * MA 02110-1301, USA. - * - * $Id: record.c,v 1.24 2000/10/17 05:58:46 hasi Exp $ - */ - -#include "config.h" -#include "libhfsp.h" -#include "hfstime.h" -#include "record.h" -#include "volume.h" -#include "btree.h" -#include "unicode.h" -#include "swab.h" - -/* read a hfsp_cat_key from memory */ -void* record_readkey(void* p, void* buf) -{ - hfsp_cat_key* key = (hfsp_cat_key*) buf; - const void* check; - UInt16 key_length, len,i; - UInt16* cp; - - key->key_length = key_length = bswabU16_inc(p); - check = p; - key->parent_cnid = bswabU32_inc(p); - key->name.strlen = len = bswabU16_inc(p); - cp = key->name.name; - for (i=0; i < len; i++, cp++) - *cp = bswabU16_inc(p); - /* check if keylenght was correct */ - if (key_length != ((char*) p) - ((char*) check)) - HFSP_ERROR(EINVAL, "Invalid key length in record_readkey"); - return p; - fail: - return NULL; -} - -/* read a hfsp_extent_key from memory */ -void* record_extent_readkey(void* p, void* buf) -{ - hfsp_extent_key* key = (hfsp_extent_key*) buf; - UInt16 key_length; - - key->key_length = key_length = bswabU16_inc(p); - key->fork_type = bswabU8_inc(p); - key->filler = bswabU8_inc(p); - if (key_length != 10) - HFSP_ERROR(-1, "Invalid key length in record_extent_readkey"); - key->file_id = bswabU32_inc(p); - key->start_block = bswabU32_inc(p); - return p; - fail: - return NULL; -} - - -/* read posix permission from memory */ -static inline void* record_readperm(void *p, hfsp_perm* perm) -{ - perm->owner= bswabU32_inc(p); - perm->group= bswabU32_inc(p); - perm->mode = bswabU32_inc(p); - perm->dev = bswabU32_inc(p); - return p; -} - -/* read directory info */ -static inline void* record_readDInfo(void *p, DInfo* info) -{ - info->frRect.top = bswabU16_inc(p); - info->frRect.left = bswabU16_inc(p); - info->frRect.bottom = bswabU16_inc(p); - info->frRect.right = bswabU16_inc(p); - info->frFlags = bswabU16_inc(p); - info->frLocation.v = bswabU16_inc(p); - info->frLocation.h = bswabU16_inc(p); - info->frView = bswabU16_inc(p); - return p; -} - -/* read extra Directory info */ -static inline void* record_readDXInfo(void *p, DXInfo* xinfo) -{ - xinfo->frScroll.v = bswabU16_inc(p); - xinfo->frScroll.h = bswabU16_inc(p); - xinfo->frOpenChain = bswabU32_inc(p); - xinfo->frUnused = bswabU16_inc(p); - xinfo->frComment = bswabU16_inc(p); - xinfo->frPutAway = bswabU32_inc(p); - return p; -} - -/* read a hfsp_cat_folder from memory */ -static void* record_readfolder(void *p, hfsp_cat_folder* folder) -{ - folder->flags = bswabU16_inc(p); - folder->valence = bswabU32_inc(p); - folder->id = bswabU32_inc(p); - folder->create_date = bswabU32_inc(p); - folder->content_mod_date = bswabU32_inc(p); - folder->attribute_mod_date = bswabU32_inc(p); - folder->access_date = bswabU32_inc(p); - folder->backup_date = bswabU32_inc(p); - p = record_readperm (p, &folder->permissions); - p = record_readDInfo (p, &folder->user_info); - p = record_readDXInfo (p, &folder->finder_info); - folder->text_encoding = bswabU32_inc(p); - folder->reserved = bswabU32_inc(p); - return p; -} - -/* read file info */ -static inline void* record_readFInfo(void *p, FInfo* info) -{ - info->fdType = bswabU32_inc(p); - info->fdCreator = bswabU32_inc(p); - info->fdFlags = bswabU16_inc(p); - info->fdLocation.v = bswabU16_inc(p); - info->fdLocation.h = bswabU16_inc(p); - info->fdFldr = bswabU16_inc(p); - return p; -} - -/* read extra File info */ -static inline void* record_readFXInfo(void *p, FXInfo* xinfo) -{ - SInt16 *q; - xinfo->fdIconID = bswabU16_inc(p); - q=(SInt16*) p; - q+=4; // skip unused - p=(void *)q; - xinfo->fdComment = bswabU16_inc(p); - xinfo->fdPutAway = bswabU32_inc(p); - return p; -} - -/* read a hfsp_cat_file from memory */ -static void* record_readfile(void *p, hfsp_cat_file* file) -{ - file->flags = bswabU16_inc(p); - file->reserved1 = bswabU32_inc(p); - file->id = bswabU32_inc(p); - file->create_date = bswabU32_inc(p); - file->content_mod_date = bswabU32_inc(p); - file->attribute_mod_date = bswabU32_inc(p); - file->access_date = bswabU32_inc(p); - file->backup_date = bswabU32_inc(p); - p = record_readperm (p, &file->permissions); - p = record_readFInfo (p, &file->user_info); - p = record_readFXInfo (p, &file->finder_info); - file->text_encoding = bswabU32_inc(p); - file->reserved2 = bswabU32_inc(p); - p = volume_readfork (p, &file->data_fork); - return volume_readfork (p, &file->res_fork); -} - -/* read a hfsp_cat_thread from memory */ -static void* record_readthread(void *p, hfsp_cat_thread* entry) -{ - int i; - UInt16 len; - UInt16* cp; - - entry-> reserved = bswabU16_inc(p); - entry-> parentID = bswabU32_inc(p); - entry->nodeName.strlen = len= bswabU16_inc(p); - cp = entry->nodeName.name; - if (len > 255) - HFSP_ERROR(-1, "Invalid key length in record thread"); - for (i=0; i < len; i++, cp++) - *cp = bswabU16_inc(p); - return p; - fail: - return NULL; -} - -/* read a hfsp_cat_entry from memory */ -static void* record_readentry(void *p, hfsp_cat_entry* entry) -{ - UInt16 type = bswabU16_inc(p); - entry->type = type; - switch (type) - { - case HFSP_FOLDER: - return record_readfolder(p, &entry->u.folder); - case HFSP_FILE: - return record_readfile (p, &entry->u.file); - case HFSP_FOLDER_THREAD: - case HFSP_FILE_THREAD: - return record_readthread(p, &entry->u.thread); - default: - HFSP_ERROR(-1, "Unexpected record type in record_readentry"); - } ; - fail: - return NULL; -} - - -/* Most of the functions here will not change the node in the btree, - But this must be changed in the future ... */ - - -/* intialize the record with the given index entry in the btree. */ -static int record_init(record* r, btree* bt, node_buf* buf, UInt16 index) -{ - void *p; - r-> tree = bt; - p = btree_key_by_index(bt,buf,index); - if (!p) - return -1; - p = record_readkey (p, &r->key); - if (!p) - return -1; - p = record_readentry(p, &r->record); - if (!p) - return -1; - r->node_index = buf->index; - r-> keyind = index; - - return 0; -} - -/* intialize the record with the given index entry in the btree. */ -static int record_init_extent(extent_record* r, btree* bt, node_buf* buf, UInt16 index) -{ - void *p; - r-> tree = bt; - p = btree_key_by_index(bt, buf,index); - if (!p) - return -1; - p = record_extent_readkey(p, &r->key); - if (!p) - return -1; - p = volume_readextent(p, r->extent); - if (!p) - return -1; - r->node_index = buf->index; - r-> keyind = index; - - return 0; -} - -/* intialize the record to the first record of the tree - * which is (per design) the root node. - */ -int record_init_root(record* r, btree* tree) -{ - // Position to first leaf node ... - UInt32 leaf_head = tree->head.leaf_head; - node_buf* buf = btree_node_by_index(tree, leaf_head); - if (!buf) - return -1; - return record_init(r, tree, buf, 0); -} - -/* Compare two cat_keys ... */ -int record_key_compare(void* k1, void* k2) -{ - hfsp_cat_key* key1 = (hfsp_cat_key*) k1; - hfsp_cat_key* key2 = (hfsp_cat_key*) k2; - int diff = key2->parent_cnid - key1->parent_cnid; - if (!diff) // same parent - diff = fast_unicode_compare(&key1->name, &key2->name); - return diff; -} - -/* Compare two extent_keys ... */ -int record_extent_key_compare(void* k1, void* k2) -{ - hfsp_extent_key* key1 = (hfsp_extent_key*) k1; - hfsp_extent_key* key2 = (hfsp_extent_key*) k2; - int diff = key2->fork_type - key1->fork_type; - if (!diff) // same type - { - diff = key2->file_id - key1->file_id; - if (!diff) // same file - diff = key2->start_block - key1->start_block; - } - return diff; -} - -/* Position node in btree so that key might be inside */ -static node_buf* record_find_node(btree* tree, void *key) -{ - int start, end, mid, comp; // components of a binary search - void *p = NULL; - char curr_key[tree->head.max_key_len]; - // The current key under examination - hfsp_key_read readkey = tree->kread; - hfsp_key_compare key_compare = tree->kcomp; - UInt32 index; - node_buf* node = btree_node_by_index(tree, tree->head.root); - if (!node) - HFSP_ERROR(-1, "record_find_node: Cant position to root node"); - while (node->desc.kind == HFSP_NODE_NDX) - { - mid = start = 0; - end = node->desc.num_rec; - comp = -1; - while (start < end) - { - mid = (start + end) >> 1; - p = btree_key_by_index(tree, node, mid); - if (!p) - HFSP_ERROR(-1, "record_find_node: unexpected error"); - p = readkey (p, curr_key); - if (!p) - HFSP_ERROR(-1, "record_find_node: unexpected error"); - comp = key_compare(curr_key, key); - if (comp > 0) - start = mid + 1; - else if (comp < 0) - end = mid; - else - break; - } - if (!p) // Empty tree, fascinating ... - HFSP_ERROR(-1, "record_find_node: unexpected empty node"); - if (comp < 0) // mmh interesting key is before this key ... - { - if (mid == 0) - return NULL; // nothing before this key .. - p = btree_key_by_index(tree, node, mid-1); - if (!p) - HFSP_ERROR(-1, "record_find_node: unexpected error"); - p = readkey (p, curr_key); - if (!p) - HFSP_ERROR(-1, "record_find_node: unexpected error"); - } - - index = bswabU32_inc(p); - node = btree_node_by_index(tree, index); - } - return node; // go on and use the found node - fail: - return NULL; -} - -/* search for the given key in the btree. - * - * returns pointer to memory just after key or NULL - * In any case *keyind recives the index where the - * key was found (or could be inserted.) - */ -static void * -record_find_key(btree* tree, void* key, int* keyind, UInt16* node_index) -{ - node_buf* buf = record_find_node(tree, key); - if (buf) - { - int comp = -1; - int start = 0; // components of a binary search - int end = buf->desc.num_rec; - int mid = -1; - void *p = NULL; - char curr_key[tree->head.max_key_len]; - hfsp_key_read readkey = tree->kread; - hfsp_key_compare key_compare = tree->kcomp; - while (start < end) - { - mid = (start + end) >> 1; - p = btree_key_by_index(tree, buf, mid); - if (!p) - HFSP_ERROR(-1, "record_init_key: unexpected error"); - p = readkey (p, curr_key); - if (!p) - HFSP_ERROR(-1, "record_init_cat_key: unexpected error"); - comp = key_compare(curr_key, key); - if (comp > 0) - start = mid + 1; - else if (comp < 0) - end = mid; - else - break; - } - if (!p) // Empty tree, fascinating ... - HFSP_ERROR(ENOENT, "record_init_key: unexpected empty node"); - *keyind = mid; - *node_index = buf->index; - if (!comp) // found something ... - return p; - } - HFSP_ERROR(ENOENT, NULL); - fail: - return NULL; -} - -/* intialize the record by searching for the given key in the btree. - * - * r is umodified on error. - */ -static int -record_init_key(record* r, btree* tree, hfsp_cat_key* key) -{ - int keyind; - UInt16 node_index; - void *p = record_find_key(tree, key, &keyind, &node_index); - - if (p) - { - r -> tree = tree; - r -> node_index= node_index; - r -> keyind = keyind; - r -> key = *key; // Better use a record_key_copy ... - p = record_readentry(p, &r->record); - if (!p) - HFSP_ERROR(-1, "record_init_key: unexpected error"); - return 0; - } - fail: - return -1; -} - -/* intialize the extent_record to the extent identified by the - * (first) blockindex. - * - * forktype: either HFSP_EXTEND_DATA or HFSP_EXTEND_RSRC - */ -int record_init_file(extent_record* r, btree* tree, - UInt8 forktype, UInt32 fileId, UInt32 blockindex) -{ - int keyind; - UInt16 node_index; - hfsp_extent_key key = { 10, forktype, 0, fileId, blockindex }; - void *p = record_find_key(tree, &key, &keyind, &node_index); - - if (p) - { - r -> tree = tree; - r -> node_index= node_index; - r -> keyind = keyind; - r -> key = key; // Better use a record_key_copy ... - p = volume_readextent(p, r->extent); - if (!p) - HFSP_ERROR(-1, "record_init_file: unexpected error"); - return 0; - } - fail: - return -1; -} - -/* intialize the record to the folder identified by cnid - */ -int record_init_cnid(record* r, btree* tree, UInt32 cnid) -{ - hfsp_cat_key thread_key; // the thread is the first record - - thread_key.key_length = 6; // null name (like '.' in unix ) - thread_key.parent_cnid = cnid; - thread_key.name.strlen = 0; - - return record_init_key(r, tree, &thread_key); -} - -/* intialize the record to the first record of the parent. - */ -int record_init_parent(record* r, record* parent) -{ - if (parent->record.type == HFSP_FOLDER) - return record_init_cnid(r, parent->tree, parent->record.u.folder.id); - else if(parent->record.type == HFSP_FOLDER_THREAD) - { - if (r != parent) - *r = *parent; // The folder thread is in fact the first entry, like '.' - return 0; - } - HFSP_ERROR(EINVAL, - "record_init_parent: parent is neither folder nor folder thread."); - - fail: - return EINVAL; -} - - -/* find correct node record for given node and *pindex. - * - * index of record in this (or next) node - * */ -static node_buf* prepare_next(btree* tree, UInt16 node_index, UInt16* pindex) -{ - node_buf* buf = btree_node_by_index(tree, node_index); - btree_node_desc* desc = &buf->desc; - UInt32 numrec = desc->num_rec; - if (*pindex >= numrec) // move on to next node - { - UInt16 next = desc->next; - *pindex = 0; - if (!next /* is there a next node ? */ - || !( buf = btree_node_by_index(tree, next))) - return NULL; - } - return buf; -} -/* move record foreward to next entry. - * - * In case of an error the value of *r is undefined ! - */ -int record_next(record* r) -{ - btree* tree = r->tree; - UInt16 index = r->keyind +1; - UInt32 parent; - node_buf* buf = prepare_next(tree, r->node_index, &index); - - if (!buf) - return ENOENT; // No (more) such file or directory - - parent = r->key.parent_cnid; - - if (record_init(r, tree, buf, index)) - return -1; - - if (r->key.parent_cnid != parent || // end of current directory - index != r->keyind) // internal error ? - return ENOENT; // No (more) such file or directory - - return 0; -} - -/* move record foreward to next extent record. - * - * In case of an error the value of *r is undefined ! - */ -int record_next_extent(extent_record* r) -{ - btree* tree = r->tree; - UInt16 index = r->keyind +1; - UInt32 file_id; - UInt8 fork_type; - node_buf* buf = prepare_next(tree, r->node_index, &index); - - if (!buf) - return ENOENT; // No (more) such file or directory - - file_id = r->key.file_id; - fork_type = r->key.fork_type; - - if (record_init_extent(r, tree, buf, index)) - return -1; - - if (r->key.file_id != file_id || // end of current file - r->key.fork_type != fork_type || // end of current fork - index != r->keyind) // internal error ? - return ENOENT; // No (more) such file or directory - - return 0; -} - -/* intialize the record by searching for the given string in the given folder. - * - * parent and r may be the same. - */ -int record_init_string_parent(record* r, record* parent, char* name) -{ - hfsp_cat_key key; - - if (parent->record.type == HFSP_FOLDER) - key.parent_cnid = parent->record.u.folder.id; - else if(parent->record.type == HFSP_FOLDER_THREAD) - key.parent_cnid = parent->key.parent_cnid; - else - HFSP_ERROR(-1, "record_init_string_parent: parent is not a folder."); - - key.key_length = 6 + unicode_asc2uni(&key.name,name); // 6 for minumum size - return record_init_key(r, parent->tree, &key); - - fail: - return -1; -} - -/* move record up in folder hierarchy (if possible) */ -int record_up(record* r) -{ - if (r->record.type == HFSP_FOLDER) - { - // locate folder thread - if (record_init_cnid(r, r->tree, r->record.u.folder.id)) - return -1; - } - else if(r->record.type == HFSP_FOLDER_THREAD) - { - // do nothing were are already where we want to be - } - else - HFSP_ERROR(-1, "record_up: record is neither folder nor folder thread."); - - if(r->record.type != HFSP_FOLDER_THREAD) - HFSP_ERROR(-1, "record_up: unable to locate parent"); - return record_init_cnid(r, r->tree, r->record.u.thread.parentID); - - fail: - return -1; -} - -#ifdef DEBUG - -/* print Quickdraw Point */ -static void record_print_Point(Point* p) -{ - printf("[ v=%d, h=%d ]", p->v, p->h); -} - -/* print Quickdraw Rect */ -static void record_print_Rect(Rect* r) -{ - printf("[ top=%d, left=%d, bottom=%d, right=%d ]", - r->top, r->left, r->bottom, r->right); -} - -/* print the key of a record */ -static void record_print_key(hfsp_cat_key* key) -{ - char buf[255]; // mh this _might_ overflow - unicode_uni2asc(buf, &key->name, 255); - printf("parent cnid : %ld\n", key->parent_cnid); - printf("name : %s\n", buf); -} - -/* print permissions */ -static void record_print_perm(hfsp_perm* perm) -{ - printf("owner :\t%ld\n", perm->owner); - printf("group :\t%ld\n", perm->group); - printf("perm :\t0x%lX\n",perm->mode); - printf("dev :\t%ld\n", perm->dev); -} - -/* print Directory info */ -static void record_print_DInfo(DInfo* dinfo) -{ - printf( "frRect :\t"); record_print_Rect(&dinfo->frRect); - printf("\nfrFlags :\t0X%X\n", dinfo->frFlags); - printf( "frLocation :\t"); record_print_Point(&dinfo->frLocation); - printf("\nfrView :\t0X%X\n", dinfo->frView); -} - -/* print extended Directory info */ -static void record_print_DXInfo(DXInfo* xinfo) -{ - printf( "frScroll :\t"); record_print_Point(&xinfo->frScroll); - printf("\nfrOpenChain :\t%ld\n", xinfo->frOpenChain); - printf( "frUnused :\t%d\n", xinfo->frUnused); - printf( "frComment :\t%d\n", xinfo->frComment); - printf( "frPutAway :\t%ld\n", xinfo->frPutAway); -} - -static void record_print_folder(hfsp_cat_folder* folder) -{ - printf("flags :\t0x%X\n", folder->flags); - printf("valence :\t0x%lX\n", folder->valence); - printf("id :\t%ld\n", folder->id); - record_print_perm (&folder->permissions); - record_print_DInfo (&folder->user_info); - record_print_DXInfo (&folder->finder_info); - printf("text_encoding :\t0x%lX\n", folder->text_encoding); - printf("reserved :\t0x%lX\n", folder->reserved); -} - -/* print File info */ -static void record_print_FInfo(FInfo* finfo) -{ - printf( "fdType :\t%4.4s\n", (char*) &finfo->fdType); - printf( "fdCreator :\t%4.4s\n", (char*) &finfo->fdCreator); - printf( "fdFlags :\t0X%X\n", finfo->fdFlags); - printf( "fdLocation :\t"); record_print_Point(&finfo->fdLocation); - printf("\nfdFldr :\t%d\n", finfo->fdFldr); -} - -/* print extended File info */ -static void record_print_FXInfo(FXInfo* xinfo) -{ - printf( "fdIconID :\t%d\n", xinfo->fdIconID); - // xinfo -> fdUnused; - printf( "fdComment :\t%d\n", xinfo->fdComment); - printf( "fdPutAway :\t%ld\n", xinfo->fdPutAway); -} - -/* print folder entry */ - -/* print file entry */ -static void record_print_file(hfsp_cat_file* file) -{ - printf("flags :\t0x%X\n", file->flags); - printf("reserved1 :\t0x%lX\n", file->reserved1); - printf("id :\t%ld\n", file->id); - record_print_perm (&file->permissions); - record_print_FInfo (&file->user_info); - record_print_FXInfo (&file->finder_info); - printf("text_encoding :\t0x%lX\n", file->text_encoding); - printf("reserved :\t0x%lX\n", file->reserved2); - printf("Datafork:\n"); - volume_print_fork (&file->data_fork); - printf("Rsrcfork:\n"); - volume_print_fork (&file->res_fork); -} - -/* print info for a file or folder thread */ -static void record_print_thread(hfsp_cat_thread* entry) -{ - char buf[255]; // mh this _might_ overflow - unicode_uni2asc(buf, &entry->nodeName, 255); - printf("parent cnid :\t%ld\n", entry->parentID); - printf("name :\t%s\n" , buf); -} - -/* print the information for a record */ -static void record_print_entry(hfsp_cat_entry* entry) -{ - switch (entry->type) - { - case HFSP_FOLDER: - printf("=== Folder ===\n"); - return record_print_folder(&entry->u.folder); - case HFSP_FILE: - printf("=== File ===\n"); - return record_print_file (&entry->u.file); - case HFSP_FOLDER_THREAD: - printf("=== Folder Thread ===\n"); - return record_print_thread(&entry->u.thread); - case HFSP_FILE_THREAD: - printf("=== File Thread ==\n"); - return record_print_thread(&entry->u.thread); - default: - printf("=== Unknown Record Type ===\n"); - } ; -} - - /* Dump all the record information to stdout */ -void record_print(record* r) -{ - printf ("keyind : %u\n", r->keyind); - record_print_key (&r->key); - record_print_entry(&r->record); -} - -#endif diff --git a/fs/hfsplus/volume.c b/fs/hfsplus/volume.c deleted file mode 100644 index 40b3eac..0000000 --- a/fs/hfsplus/volume.c +++ /dev/null @@ -1,314 +0,0 @@ -/* - * libhfs - library for reading and writing Macintosh HFS volumes - * - * Code to acces the basic volume information of a HFS+ volume. - * - * Copyright (C) 2000 Klaus Halfmann <khalfmann(a)libra.de> - * Original work by 1996-1998 Robert Leslie <rob(a)mars.org> - * other work 2000 from Brad Boyer (flar(a)pants.nu) - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, - * MA 02110-1301, USA. - * - * $Id: volume.c,v 1.21 2000/10/25 05:43:04 hasi Exp $ - */ - -#include "config.h" -#include "libhfsp.h" -#include "volume.h" -#include "record.h" -#include "btree.h" -#include "blockiter.h" -#include "os.h" -#include "swab.h" -#include "hfstime.h" - - -/* Fill a given buffer with the given block in volume. - */ -int -volume_readinbuf(volume * vol,void* buf, long block) -{ - UInt16 blksize_bits; - ASSERT( block < vol->maxblocks); - - blksize_bits = vol->blksize_bits; - block += vol->startblock; - if( os_seek(vol->os_fd, block, blksize_bits) == block) - if( 1 == os_read(vol->os_fd, buf, 1, blksize_bits)) - return 0; - return -1; -} - -/* read multiple blocks into given memory. - * - * returns given pinter or NULL on failure. - */ -void* -volume_readfromfork(volume* vol, void* buf, - hfsp_fork_raw* f, UInt32 block, - UInt32 count, UInt8 forktype, UInt32 fileId) -{ - blockiter iter; - char *cbuf = buf; - - blockiter_init(&iter, vol, f, forktype, fileId); - if( blockiter_skip(&iter, block)) - return NULL; - - while( count > 0) { - --count; - if( volume_readinbuf(vol, cbuf, blockiter_curr(&iter))) - return NULL; - cbuf += vol->blksize; - if( count > 0 && blockiter_next(&iter)) - return NULL; - } - return buf; -} - - -/* Read a raw hfsp_extent_rec from memory. - * - * return pointer right after the structure. - */ -void* -volume_readextent(void *p, hfsp_extent_rec er) -{ - int i; - hfsp_extent *e; - - for( i=0; i < 8; i++) { - e = &er[i]; - e->start_block = bswabU32_inc(p); - e->block_count = bswabU32_inc(p); - } - return p; -} - -/* Read a raw hfsp_fork from memory. - * - * return pointer right after the structure. - */ -void* -volume_readfork(void *p, hfsp_fork_raw* f) -{ - f->total_size = bswabU64_inc(p); - f->clump_size = bswabU32_inc(p); - f->total_blocks = bswabU32_inc(p); - - return volume_readextent(p, f->extents); -} - -/* Read the volume from the given buffer and swap the bytes. - * - * ToDo: add more consitency checks. - */ -static int -volume_readbuf(hfsp_vh* vh, char * p) -{ - if( (vh->signature = bswabU16_inc(p)) != HFSP_VOLHEAD_SIG) - HFSP_ERROR(-1, "This is not a HFS+ volume"); - - vh->version = bswabU16_inc(p); - vh->attributes = bswabU32_inc(p); - vh->last_mount_vers = bswabU32_inc(p); - vh->reserved = bswabU32_inc(p); - vh->create_date = bswabU32_inc(p); - vh->modify_date = bswabU32_inc(p); - vh->backup_date = bswabU32_inc(p); - vh->checked_date = bswabU32_inc(p); - vh->file_count = bswabU32_inc(p); - vh->folder_count = bswabU32_inc(p); - vh->blocksize = bswabU32_inc(p); - vh->total_blocks = bswabU32_inc(p); - vh->free_blocks = bswabU32_inc(p); - vh->next_alloc = bswabU32_inc(p); - vh->rsrc_clump_sz = bswabU32_inc(p); - vh->data_clump_sz = bswabU32_inc(p); - vh->next_cnid = bswabU32_inc(p); - vh->write_count = bswabU32_inc(p); - vh->encodings_bmp = bswabU64_inc(p); - memcpy(vh->finder_info, p, 32); - p += 32; // So finderinfo must be swapped later, *** - p = volume_readfork(p, &vh->alloc_file ); - p = volume_readfork(p, &vh->ext_file ); - p = volume_readfork(p, &vh->cat_file ); - p = volume_readfork(p, &vh->attr_file ); - volume_readfork(p, &vh->start_file ); - return 0; - fail: - return -1; -} - -/* Read the volume from the given block */ -static int -volume_read(volume * vol, hfsp_vh* vh, UInt32 block) -{ - char buf[vol->blksize]; - - if( volume_readinbuf(vol, buf, block)) - return -1; - return volume_readbuf(vh, buf); -} - -/* Find out wether the volume is wrapped and unwrap it eventually */ -static int -volume_read_wrapper(volume * vol, hfsp_vh* vh) -{ - UInt16 signature; - char buf[vol->blksize]; - char *p = buf; - - if( volume_readinbuf(vol, buf, 2) ) // Wrapper or volume header starts here - return -1; - - signature = bswabU16_inc(p); - if( signature == HFS_VOLHEAD_SIG) { /* Wrapper */ - UInt32 drAlBlkSiz; /* size (in bytes) of allocation blocks */ - UInt32 sect_per_block; /* how may block build an hfs sector */ - UInt16 drAlBlSt; /* first allocation block in volume */ - UInt16 embeds, embedl; /* Start/lenght of embedded area in blocks */ - - p += 0x12; /* skip unneded HFS vol fields */ - drAlBlkSiz = bswabU32_inc(p); /* offset 0x14 */ - p += 0x4; /* skip unneded HFS vol fields */ - drAlBlSt = bswabU16_inc(p); /* offset 0x1C */ - - p += 0x5E; /* skip unneded HFS vol fields */ - signature = bswabU16_inc(p); /* offset 0x7C, drEmbedSigWord */ - if( signature != HFSP_VOLHEAD_SIG) - HFSP_ERROR(-1, "This looks like a normal HFS volume"); - embeds = bswabU16_inc(p); - embedl = bswabU16_inc(p); - sect_per_block = (drAlBlkSiz / HFSP_BLOCKSZ); - // end is absolute (not relative to HFS+ start) - vol->maxblocks = embedl * sect_per_block; - vol->startblock = drAlBlSt + embeds * sect_per_block; - /* Now we can try to read the embedded HFS+ volume header */ - return volume_read(vol,vh,2); - } - else if( signature == HFSP_VOLHEAD_SIG) { /* Native HFS+ volume */ - p = buf; // Restore to begin of block - return volume_readbuf(vh, p); - } else - HFSP_ERROR(-1, "Neither Wrapper nor native HFS+ volume header found"); -fail: - return -1; -} - - -/* Open the device, read and verify the volume header - (and its backup) */ -int -volume_open( volume* vol, int os_fd ) -{ - hfsp_vh backup; /* backup volume found at second to last block */ - long sect_per_block; - int shift; - - vol->blksize_bits = HFSP_BLOCKSZ_BITS; - vol->blksize = HFSP_BLOCKSZ; - vol->startblock = 0; - vol->maxblocks = 3; - /* this should be enough until we find the volume descriptor */ - vol->extents = NULL; /* Thanks to Jeremias Sauceda */ - - btree_reset(&vol->catalog); - vol->os_fd = os_fd; - - // vol->maxblocks = os_seek(vol->os_fd, -1, HFSP_BLOCKSZ_BITS); - // This wont work for /dev/... but we do not really need it - - if( volume_read_wrapper(vol, &vol->vol)) - return -1; - if( volume_read(vol, &backup, vol->maxblocks - 2)) - return -1; - - /* Now switch blksize from HFSP_BLOCKSZ (512) to value given in header - and adjust depend values accordingly, after that a block always - means a HFS+ allocation size */ - - /* Usually 4096 / 512 == 8 */ - sect_per_block = vol->vol.blocksize / HFSP_BLOCKSZ; - shift = 0; - if( sect_per_block > 1) { - shift = 1; - while( sect_per_block > 2) { - sect_per_block >>=1; - shift++; - } /* shift = 3 */ - } - vol -> blksize_bits += shift; - vol -> blksize = 1 << vol->blksize_bits; - vol -> startblock >>= shift; - vol -> maxblocks = vol->vol.total_blocks; /* cant calculate via shift ? */ - - if( btree_init_cat(&vol->catalog, vol, &vol->vol.cat_file)) - return -1; - - return 0; -} - -/* Write back all data eventually cached and close the device */ -int -volume_close(volume* vol) -{ - btree_close(&vol->catalog); - if( vol->extents) { - btree_close(vol->extents); - FREE(vol->extents); - } - return 0; -} - -/* internal fucntion used to create the extents btree, - is called by inline function when needed */ -void -volume_create_extents_tree(volume* vol) -{ - btree* result = (btree*) ALLOC(btree*, sizeof(btree)); - if( !result) - HFSP_ERROR(ENOMEM, "No memory for extents btree"); - if( !btree_init_extent(result, vol, &vol->vol.ext_file)) { - vol->extents = result; - return; - } - fail: - vol->extents = NULL; -} - -/* Determine whether the volume is a HFS-plus volume */ -int -volume_probe(int fd, long long offset) -{ - UInt16 *vol; - int ret = 0; - - vol = (UInt16 *)malloc(2 * 1 << HFSP_BLOCKSZ_BITS); - os_seek_offset( fd, 2 * (1 << HFSP_BLOCKSZ_BITS) + offset ); - os_read(fd, vol, 2, HFSP_BLOCKSZ_BITS); - - if (__be16_to_cpu(vol[0]) == HFS_VOLHEAD_SIG && - __be16_to_cpu(vol[0x7c]) == HFSP_VOLHEAD_SIG) { - ret = -1; - } else if (__be16_to_cpu(vol[0]) == HFSP_VOLHEAD_SIG) { - ret = -1; - } - - free(vol); - return ret; -} - -- 1.6.2.4

3 9

[commit] r978 - trunk/openbios-devel/fs/hfsplus
by repository service 28 Nov '10

28 Nov '10

Author: blueswirl Date: Sun Nov 28 21:03:46 2010 New Revision: 978 URL: http://tracker.coreboot.org/trac/openbios/changeset/978 Log: Rename conflicting hfsplus files Files in fs/hfs and fs/hfsplus have same names, this causes problems during linkage. Use prefix 'hfsp_' for the conflicting files. Acked-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Added: trunk/openbios-devel/fs/hfsplus/hfsp_blockiter.c - copied, changed from r977, trunk/openbios-devel/fs/hfsplus/blockiter.c trunk/openbios-devel/fs/hfsplus/hfsp_btree.c - copied, changed from r977, trunk/openbios-devel/fs/hfsplus/btree.c trunk/openbios-devel/fs/hfsplus/hfsp_record.c - copied, changed from r977, trunk/openbios-devel/fs/hfsplus/record.c trunk/openbios-devel/fs/hfsplus/hfsp_unicode.c - copied, changed from r977, trunk/openbios-devel/fs/hfsplus/unicode.c trunk/openbios-devel/fs/hfsplus/hfsp_volume.c - copied, changed from r977, trunk/openbios-devel/fs/hfsplus/volume.c Deleted: trunk/openbios-devel/fs/hfsplus/blockiter.c trunk/openbios-devel/fs/hfsplus/btree.c trunk/openbios-devel/fs/hfsplus/record.c trunk/openbios-devel/fs/hfsplus/unicode.c trunk/openbios-devel/fs/hfsplus/volume.c Modified: trunk/openbios-devel/fs/hfsplus/build.xml Modified: trunk/openbios-devel/fs/hfsplus/build.xml ============================================================================== --- trunk/openbios-devel/fs/hfsplus/build.xml Sun Nov 28 14:13:38 2010 (r977) +++ trunk/openbios-devel/fs/hfsplus/build.xml Sun Nov 28 21:03:46 2010 (r978) @@ -1,11 +1,11 @@ <build> <library name="fs" type="static" target="target"> - <object source="blockiter.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> - <object source="btree.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> + <object source="hfsp_blockiter.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> + <object source="hfsp_btree.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> <object source="libhfsp.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> - <object source="record.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> - <object source="unicode.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> - <object source="volume.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> + <object source="hfsp_record.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> + <object source="hfsp_unicode.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> + <object source="hfsp_volume.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> <object source="hfsp_fs.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> </library> </build> Copied and modified: trunk/openbios-devel/fs/hfsplus/hfsp_blockiter.c (from r977, trunk/openbios-devel/fs/hfsplus/blockiter.c) ============================================================================== Copied and modified: trunk/openbios-devel/fs/hfsplus/hfsp_btree.c (from r977, trunk/openbios-devel/fs/hfsplus/btree.c) ============================================================================== --- trunk/openbios-devel/fs/hfsplus/btree.c Sun Nov 28 14:13:38 2010 (r977, copy source) +++ trunk/openbios-devel/fs/hfsplus/hfsp_btree.c Sun Nov 28 21:03:46 2010 (r978) @@ -287,7 +287,7 @@ UInt16 node_size = bt->head.node_size; // The offsets are found at the end of the node ... UInt16 off_pos = node_size - (index +1) * sizeof(btree_record_offset); - // position of offset at end of node + // position of offset at end of node btree_record_offset* offset = (btree_record_offset*) (buf->node + off_pos); Copied and modified: trunk/openbios-devel/fs/hfsplus/hfsp_record.c (from r977, trunk/openbios-devel/fs/hfsplus/record.c) ============================================================================== Copied and modified: trunk/openbios-devel/fs/hfsplus/hfsp_unicode.c (from r977, trunk/openbios-devel/fs/hfsplus/unicode.c) ============================================================================== Copied and modified: trunk/openbios-devel/fs/hfsplus/hfsp_volume.c (from r977, trunk/openbios-devel/fs/hfsplus/volume.c) ============================================================================== --- trunk/openbios-devel/fs/hfsplus/volume.c Sun Nov 28 14:13:38 2010 (r977, copy source) +++ trunk/openbios-devel/fs/hfsplus/hfsp_volume.c Sun Nov 28 21:03:46 2010 (r978) @@ -180,7 +180,7 @@ UInt32 drAlBlkSiz; /* size (in bytes) of allocation blocks */ UInt32 sect_per_block; /* how may block build an hfs sector */ UInt16 drAlBlSt; /* first allocation block in volume */ - UInt16 embeds, embedl; /* Start/lenght of embedded area in blocks */ + UInt16 embeds, embedl; /* Start/lenght of embedded area in blocks */ p += 0x12; /* skip unneded HFS vol fields */ drAlBlkSiz = bswabU32_inc(p); /* offset 0x14 */ @@ -303,7 +303,7 @@ if (__be16_to_cpu(vol[0]) == HFS_VOLHEAD_SIG && __be16_to_cpu(vol[0x7c]) == HFSP_VOLHEAD_SIG) { - ret = -1; + ret = -1; } else if (__be16_to_cpu(vol[0]) == HFSP_VOLHEAD_SIG) { ret = -1; }

1 0

[commit] r976 - in trunk/openbios-devel: arch/ppc/qemu include/arch/ppc
by repository service 28 Nov '10

28 Nov '10

Author: afaerber Date: Sun Nov 28 12:40:42 2010 New Revision: 976 URL: http://tracker.coreboot.org/trac/openbios/changeset/976 Log: ppc: Create function descriptors for global functions on ppc64 This should also fix linker errors observed by Blue. v2: * __divide_error is called from C code, too. Spotted by Blue. Cc: Blue Swirl <blauwirbel(a)gmail.com> Cc: Alexander Graf <agraf(a)suse.de> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/arch/ppc/qemu/start.S trunk/openbios-devel/include/arch/ppc/asmdefs.h Modified: trunk/openbios-devel/arch/ppc/qemu/start.S ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/start.S Sat Nov 27 23:37:46 2010 (r975) +++ trunk/openbios-devel/arch/ppc/qemu/start.S Sun Nov 28 12:40:42 2010 (r976) @@ -285,8 +285,7 @@ exception_return: EXCEPTION_EPILOGUE - .globl __divide_error -__divide_error: +_GLOBAL(__divide_error): trap_error: mflr r3 b BRANCH_LABEL(unexpected_excep) @@ -473,7 +472,7 @@ .long 0 .previous /* void call_elf( arg1, arg2, entry ) */ -GLOBL(call_elf): +_GLOBAL(call_elf): mflr r0 stwu r1,-16(r1) stw r0,20(r1) @@ -633,7 +632,7 @@ #define LG_CACHE_LINE_SIZE 5 /* flush_icache_range( unsigned long start, unsigned long stop) */ -GLOBL(flush_icache_range): +_GLOBAL(flush_icache_range): li r5,CACHE_LINE_SIZE-1 andc r3,r3,r5 subf r4,r3,r4 Modified: trunk/openbios-devel/include/arch/ppc/asmdefs.h ============================================================================== --- trunk/openbios-devel/include/arch/ppc/asmdefs.h Sat Nov 27 23:37:46 2010 (r975) +++ trunk/openbios-devel/include/arch/ppc/asmdefs.h Sun Nov 28 12:40:42 2010 (r976) @@ -118,6 +118,24 @@ #define EXTERN( name ) _##name #endif +#if defined(__powerpc64__) && !defined(__darwin__) +#define _GLOBAL(name) \ + .align 2 ; \ + .section ".opd", "aw" ; \ + .globl name ; \ + .globl .##name ; \ + name: \ + .quad .##name ; \ + .quad .TOC.@tocbase ; \ + .quad 0 ; \ + .previous ; \ + .type .##name, @function ; \ + .##name +#else +#define _GLOBAL(name) \ + GLOBL(name) +#endif + #define BIT(n) (1<<(31-(n))) #endif /* _H_ASMDEFS */

3 7

[commit] r977 - trunk/openbios-devel/arch/ppc
by repository service 28 Nov '10

28 Nov '10

Author: afaerber Date: Sun Nov 28 14:13:38 2010 New Revision: 977 URL: http://tracker.coreboot.org/trac/openbios/changeset/977 Log: ppc: Create some more function descriptors for ppc64 Fix an error in generic ppc code as well. Reported by Blue. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Acked-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/ppc/timebase.S Modified: trunk/openbios-devel/arch/ppc/timebase.S ============================================================================== --- trunk/openbios-devel/arch/ppc/timebase.S Sun Nov 28 12:40:42 2010 (r976) +++ trunk/openbios-devel/arch/ppc/timebase.S Sun Nov 28 14:13:38 2010 (r977) @@ -4,7 +4,7 @@ /* * unsigned long long _get_ticks(void); */ -GLOBL(_get_ticks): +_GLOBAL(_get_ticks): 1: mftbu r3 mftb r4 mftbu r5 @@ -15,16 +15,16 @@ /* * Delay for a number of ticks */ -GLOBL(_wait_ticks): +_GLOBAL(_wait_ticks): mflr r8 /* save link register */ mr r7, r3 /* save tick count */ - bl _get_ticks /* Get start time */ + bl BRANCH_LABEL(_get_ticks) /* Get start time */ /* Calculate end time */ addc r7, r4, r7 /* Compute end time lower */ addze r6, r3 /* and end time upper */ -1: bl _get_ticks /* Get current time */ +1: bl BRANCH_LABEL(_get_ticks) /* Get current time */ subfc r4, r4, r7 /* Subtract current time from end time */ subfe. r3, r3, r6 bge 1b /* Loop until time expired */

1 0

[PATCH] ppc: Increase #address-cells for ppc64
by Andreas Färber 28 Nov '10

28 Nov '10

To store a full 64-bit address we need two cells. This matches Apple's OpenFirmware on my G5. Note that an enlarged #size-cells is not strictly needed and constitutes a difference between Apple and IBM firmware. Cc: Alexander Graf <agraf(a)suse.de> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> --- arch/ppc/qemu/init.c | 4 +++- arch/ppc/qemu/tree.fs | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/ppc/qemu/init.c b/arch/ppc/qemu/init.c index d17c843..1a2d453 100644 --- a/arch/ppc/qemu/init.c +++ b/arch/ppc/qemu/init.c @@ -734,8 +734,10 @@ arch_of_init( void ) /* all memory */ - /* TODO Adjust this when #address-cells gets increased for ppc64. */ PUSH(0); +#ifdef CONFIG_PPC64 + PUSH(0); +#endif fword("encode-phys"); /* This needs adjusting if #size-cells gets increased. Alternatively use multiple (address, size) tuples. */ diff --git a/arch/ppc/qemu/tree.fs b/arch/ppc/qemu/tree.fs index 4d107a9..e4115ea 100644 --- a/arch/ppc/qemu/tree.fs +++ b/arch/ppc/qemu/tree.fs @@ -5,13 +5,15 @@ \ as published by the Free Software Foundation \ +include config.fs + \ ------------------------------------------------------------- \ device-tree \ ------------------------------------------------------------- " /" find-device -1 encode-int " #address-cells" property +[IFDEF] CONFIG_PPC64 2 [ELSE] 1 [THEN] encode-int " #address-cells" property 1 encode-int " #size-cells" property h# 05f5e100 encode-int " clock-frequency" property -- 1.7.3

2 5

[commit] r975 - trunk/openbios-devel/arch/ppc/qemu
by repository service 27 Nov '10

27 Nov '10

Author: afaerber Date: Sat Nov 27 23:37:46 2010 New Revision: 975 URL: http://tracker.coreboot.org/trac/openbios/changeset/975 Log: ppc: Increase #address-cells for ppc64 To store a full 64-bit address we need two cells. This setting matches Apple's OpenFirmware on my G5 and IBM's firmware on the JS20. The PCI driver zero-pads its physical addresses, so is okay as long as devices remain in lower 32 bits. ofmem needs changes for memory ranges and translations. Note that an enlarged #size-cells is not strictly needed and constitutes a difference between Apple and IBM firmware (1 vs. 2). v2: * Introduce local helper push_physaddr(). A more general, global definition was not easily reachable due to inability to determine in preprocessor whether phys_addr_t is wider than ucell, leading to compilation errors due to a shift the size of the variable. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/ppc/qemu/tree.fs Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sat Nov 27 18:58:30 2010 (r974) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sat Nov 27 23:37:46 2010 (r975) @@ -191,6 +191,16 @@ } } +/* -- phys.lo ... phys.hi */ +static void +push_physaddr(phys_addr_t value) +{ + PUSH(value); +#ifdef CONFIG_PPC64 + PUSH(value >> 32); +#endif +} + static void cpu_generic_init(const struct cpudef *cpu) { @@ -730,8 +740,7 @@ /* all memory */ - /* TODO Adjust this when #address-cells gets increased for ppc64. */ - PUSH(0); + push_physaddr(0); fword("encode-phys"); /* This needs adjusting if #size-cells gets increased. Alternatively use multiple (address, size) tuples. */ Modified: trunk/openbios-devel/arch/ppc/qemu/tree.fs ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/tree.fs Sat Nov 27 18:58:30 2010 (r974) +++ trunk/openbios-devel/arch/ppc/qemu/tree.fs Sat Nov 27 23:37:46 2010 (r975) @@ -5,13 +5,15 @@ \ as published by the Free Software Foundation \ +include config.fs + \ ------------------------------------------------------------- \ device-tree \ ------------------------------------------------------------- " /" find-device -1 encode-int " #address-cells" property +[IFDEF] CONFIG_PPC64 2 [ELSE] 1 [THEN] encode-int " #address-cells" property 1 encode-int " #size-cells" property h# 05f5e100 encode-int " clock-frequency" property

1 0

[commit] r974 - trunk/openbios-devel/arch/ppc/qemu
by repository service 27 Nov '10

27 Nov '10

Author: afaerber Date: Sat Nov 27 18:58:30 2010 New Revision: 974 URL: http://tracker.coreboot.org/trac/openbios/changeset/974 Log: ppc: Introduce define for OpenBIOS code size Use it for all three occurrences. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sat Nov 27 18:07:59 2010 (r973) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sat Nov 27 18:58:30 2010 (r974) @@ -46,6 +46,7 @@ #define FREE_BASE 0x00004000 #define OF_CODE_START 0xfff00000UL +#define OF_CODE_SIZE 0x00100000 #define IO_BASE 0x80000000 #ifdef __powerpc64__ @@ -69,7 +70,7 @@ get_rom_base(void) { ofmem_t *ofmem = ofmem_arch_get_private(); - return ofmem->ramsize - 0x00100000; + return ofmem->ramsize - OF_CODE_SIZE; } unsigned long @@ -394,7 +395,7 @@ /* SDR1: Storage Description Register 1 */ - hash_base = (ramsize - 0x00100000 - HASH_SIZE) & hash_mask; + hash_base = (ramsize - OF_CODE_SIZE - HASH_SIZE) & hash_mask; memset((void *)hash_base, 0, HASH_SIZE); if (is_ppc64()) mtsdr1(hash_base | MAX(HASH_BITS - 18, 0)); @@ -428,7 +429,7 @@ memset(ofmem, 0, sizeof(ofmem_t)); ofmem->ramsize = ramsize; - memcpy((void *)get_rom_base(), (void *)OF_CODE_START, 0x00100000); + memcpy((void *)get_rom_base(), (void *)OF_CODE_START, OF_CODE_SIZE); /* Enable MMU */

1 0

[commit] r973 - trunk/openbios-devel/arch/ppc/qemu
by repository service 27 Nov '10

27 Nov '10

Author: afaerber Date: Sat Nov 27 18:07:59 2010 New Revision: 973 URL: http://tracker.coreboot.org/trac/openbios/changeset/973 Log: ppc: Adapt CPU definition and identification PVR is 32 bits. Use the new inline function. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sat Nov 27 17:41:12 2010 (r972) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sat Nov 27 18:07:59 2010 (r973) @@ -38,7 +38,7 @@ #define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" struct cpudef { - unsigned long iu_version; + unsigned int iu_version; const char *name; int icache_size, dcache_size; int icache_sets, dcache_sets; @@ -502,18 +502,16 @@ static const struct cpudef * id_cpu(void) { - unsigned long iu_version; + unsigned int iu_version; unsigned int i; - asm("mfpvr %0\n" - : "=r"(iu_version) :); - iu_version &= 0xffff0000; + iu_version = mfpvr() & 0xffff0000; for (i = 0; i < sizeof(ppc_defs) / sizeof(struct cpudef); i++) { if (iu_version == ppc_defs[i].iu_version) return &ppc_defs[i]; } - printk("Unknown cpu (pvr %lx), freezing!\n", iu_version); + printk("Unknown cpu (pvr %x), freezing!\n", iu_version); for (;;) { } }

1 0

[commit] r972 - trunk/openbios-devel/arch/ppc/qemu
by repository service 27 Nov '10

27 Nov '10

Author: afaerber Date: Sat Nov 27 17:41:12 2010 New Revision: 972 URL: http://tracker.coreboot.org/trac/openbios/changeset/972 Log: ppc: Coding style cleanup, part 2 Fix some more indentations. Still no functional changes. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sat Nov 27 17:29:32 2010 (r971) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sat Nov 27 17:41:12 2010 (r972) @@ -68,17 +68,17 @@ int is_apple(void) { - return 1; + return 1; } int is_oldworld(void) { - return machine_id == ARCH_HEATHROW; + return machine_id == ARCH_HEATHROW; } int is_newworld(void) { - return (machine_id == ARCH_MAC99) || + return (machine_id == ARCH_MAC99) || (machine_id == ARCH_MAC99_U3); }

1 0

[commit] r971 - trunk/openbios-devel/arch/ppc/qemu
by repository service 27 Nov '10

27 Nov '10

Author: afaerber Date: Sat Nov 27 17:29:32 2010 New Revision: 971 URL: http://tracker.coreboot.org/trac/openbios/changeset/971 Log: ppc: Coding style cleanup Adopt QEMU coding style for indentation, spacing and parenthesis. Avoid empty statement in for loops. Move comment out of function body. No functional changes. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/ppc/qemu/ofmem.c Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sat Nov 27 01:46:44 2010 (r970) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sat Nov 27 17:29:32 2010 (r971) @@ -49,14 +49,14 @@ static uint16_t machine_id = 0; -extern void unexpected_excep( int vector ); +extern void unexpected_excep(int vector); void -unexpected_excep( int vector ) +unexpected_excep(int vector) { - printk("openbios panic: Unexpected exception %x\n", vector ); - for( ;; ) - ; + printk("openbios panic: Unexpected exception %x\n", vector); + for (;;) { + } } enum { @@ -79,7 +79,7 @@ int is_newworld(void) { return (machine_id == ARCH_MAC99) || - (machine_id == ARCH_MAC99_U3); + (machine_id == ARCH_MAC99_U3); } static const pci_arch_t known_arch[] = { @@ -155,39 +155,40 @@ unsigned long isa_io_base; void -entry( void ) +entry(void) { - uint32_t temp = 0; - char buf[5]; + uint32_t temp = 0; + char buf[5]; - arch = &known_arch[ARCH_HEATHROW]; + arch = &known_arch[ARCH_HEATHROW]; - fw_cfg_init(); + fw_cfg_init(); - fw_cfg_read(FW_CFG_SIGNATURE, buf, 4); - buf[4] = '\0'; - if (strncmp(buf, "QEMU", 4) == 0) { - temp = fw_cfg_read_i32(FW_CFG_ID); - if (temp == 1) { - machine_id = fw_cfg_read_i16(FW_CFG_MACHINE_ID); - arch = &known_arch[machine_id]; - } + fw_cfg_read(FW_CFG_SIGNATURE, buf, 4); + buf[4] = '\0'; + if (strncmp(buf, "QEMU", 4) == 0) { + temp = fw_cfg_read_i32(FW_CFG_ID); + if (temp == 1) { + machine_id = fw_cfg_read_i16(FW_CFG_MACHINE_ID); + arch = &known_arch[machine_id]; } + } - isa_io_base = arch->io_base; + isa_io_base = arch->io_base; - if (temp != 1) { - printk("Incompatible configuration device version, freezing\n"); - for(;;); + if (temp != 1) { + printk("Incompatible configuration device version, freezing\n"); + for (;;) { } + } + + ofmem_init(); + initialize_forth(); + /* won't return */ - ofmem_init(); - initialize_forth(); - /* won't return */ - - printk("of_startup returned!\n"); - for( ;; ) - ; + printk("of_startup returned!\n"); + for (;;) { + } } static void @@ -316,8 +317,8 @@ *isi = 0x48002202; // Invalidate the cache lines - asm ( "icbi 0, %0" : : "r"(dsi) ); - asm ( "icbi 0, %0" : : "r"(isi) ); + asm ("icbi 0, %0" : : "r"(dsi)); + asm ("icbi 0, %0" : : "r"(isi)); } #endif @@ -508,352 +509,355 @@ : "=r"(iu_version) :); iu_version &= 0xffff0000; - for (i = 0; i < sizeof(ppc_defs)/sizeof(struct cpudef); i++) { + for (i = 0; i < sizeof(ppc_defs) / sizeof(struct cpudef); i++) { if (iu_version == ppc_defs[i].iu_version) return &ppc_defs[i]; } printk("Unknown cpu (pvr %lx), freezing!\n", iu_version); - for (;;); + for (;;) { + } } -static void go( void ); +static void go(void); static void -go( void ) +go(void) { ucell addr; feval("saved-program-state >sps.entry @"); addr = POP(); - call_elf( 0, 0, addr); + call_elf(0, 0, addr); } static void kvm_of_init(void) { - char hypercall[4 * 4]; - uint32_t *hc32; + char hypercall[4 * 4]; + uint32_t *hc32; + + /* Don't expose /hypervisor when not in KVM */ + if (!fw_cfg_read_i32(FW_CFG_PPC_IS_KVM)) + return; + + push_str("/"); + fword("find-device"); + + fword("new-device"); + + push_str("hypervisor"); + fword("device-name"); + + push_str("hypervisor"); + fword("device-type"); + + /* compatible */ + + push_str("linux,kvm"); + fword("encode-string"); + push_str("epapr,hypervisor-0.2"); + fword("encode-string"); + fword("encode+"); + push_str("compatible"); + fword("property"); + + /* Tell the guest about the hypercall instructions */ + fw_cfg_read(FW_CFG_PPC_KVM_HC, hypercall, 4 * 4); + hc32 = (uint32_t*)hypercall; + PUSH(hc32[0]); + fword("encode-int"); + PUSH(hc32[1]); + fword("encode-int"); + fword("encode+"); + PUSH(hc32[2]); + fword("encode-int"); + fword("encode+"); + PUSH(hc32[3]); + fword("encode-int"); + fword("encode+"); + push_str("hcall-instructions"); + fword("property"); - /* Don't expose /hypervisor when not in KVM */ - if (!fw_cfg_read_i32(FW_CFG_PPC_IS_KVM)) - return; - - push_str("/"); - fword("find-device"); - - fword("new-device"); - - push_str("hypervisor"); - fword("device-name"); - - push_str("hypervisor"); - fword("device-type"); - - /* compatible */ - - push_str("linux,kvm"); - fword("encode-string"); - push_str("epapr,hypervisor-0.2"); - fword("encode-string"); - fword("encode+"); - push_str("compatible"); - fword("property"); - - /* Tell the guest about the hypercall instructions */ - fw_cfg_read(FW_CFG_PPC_KVM_HC, hypercall, 4 * 4); - hc32 = (uint32_t*)hypercall; - PUSH(hc32[0]); - fword("encode-int"); - PUSH(hc32[1]); - fword("encode-int"); - fword("encode+"); - PUSH(hc32[2]); - fword("encode-int"); - fword("encode+"); - PUSH(hc32[3]); - fword("encode-int"); - fword("encode+"); - push_str("hcall-instructions"); - fword("property"); - - /* ePAPR requires us to provide a unique guest id */ - PUSH(fw_cfg_read_i32(FW_CFG_PPC_KVM_PID)); - fword("encode-int"); - push_str("guest-id"); - fword("property"); - - /* ePAPR requires us to provide a guest name */ - push_str("KVM guest"); - fword("encode-string"); - push_str("guest-name"); - fword("property"); + /* ePAPR requires us to provide a unique guest id */ + PUSH(fw_cfg_read_i32(FW_CFG_PPC_KVM_PID)); + fword("encode-int"); + push_str("guest-id"); + fword("property"); - fword("finish-device"); + /* ePAPR requires us to provide a guest name */ + push_str("KVM guest"); + fword("encode-string"); + push_str("guest-name"); + fword("property"); + + fword("finish-device"); } void -arch_of_init( void ) +arch_of_init(void) { #ifdef CONFIG_RTAS - phandle_t ph; + phandle_t ph; #endif - uint64_t ram_size; - const struct cpudef *cpu; - char buf[64], qemu_uuid[16]; - const char *stdin_path, *stdout_path, *boot_path; - uint32_t temp = 0; + uint64_t ram_size; + const struct cpudef *cpu; + char buf[64], qemu_uuid[16]; + const char *stdin_path, *stdout_path, *boot_path; + uint32_t temp = 0; ofmem_t *ofmem = ofmem_arch_get_private(); - openbios_init(); - modules_init(); - setup_timers(); + openbios_init(); + modules_init(); + setup_timers(); #ifdef CONFIG_DRIVER_PCI - ob_pci_init(); + ob_pci_init(); #endif - printk("\n"); - printk("=============================================================\n"); - printk(PROGRAM_NAME " " OPENBIOS_VERSION_STR " [%s]\n", - OPENBIOS_BUILD_DATE); - - fw_cfg_read(FW_CFG_SIGNATURE, buf, 4); - buf[4] = '\0'; - printk("Configuration device id %s", buf); + printk("\n"); + printk("=============================================================\n"); + printk(PROGRAM_NAME " " OPENBIOS_VERSION_STR " [%s]\n", + OPENBIOS_BUILD_DATE); - temp = fw_cfg_read_i32(FW_CFG_ID); - printk(" version %d machine id %d\n", temp, machine_id); - - temp = fw_cfg_read_i32(FW_CFG_NB_CPUS); - - printk("CPUs: %x\n", temp); - - ram_size = ofmem->ramsize; - - printk("Memory: %lldM\n", ram_size / 1024 / 1024); - - fw_cfg_read(FW_CFG_UUID, qemu_uuid, 16); + fw_cfg_read(FW_CFG_SIGNATURE, buf, 4); + buf[4] = '\0'; + printk("Configuration device id %s", buf); - printk("UUID: " UUID_FMT "\n", qemu_uuid[0], qemu_uuid[1], qemu_uuid[2], - qemu_uuid[3], qemu_uuid[4], qemu_uuid[5], qemu_uuid[6], - qemu_uuid[7], qemu_uuid[8], qemu_uuid[9], qemu_uuid[10], - qemu_uuid[11], qemu_uuid[12], qemu_uuid[13], qemu_uuid[14], - qemu_uuid[15]); + temp = fw_cfg_read_i32(FW_CFG_ID); + printk(" version %d machine id %d\n", temp, machine_id); - /* set device tree root info */ + temp = fw_cfg_read_i32(FW_CFG_NB_CPUS); - push_str("/"); - fword("find-device"); + printk("CPUs: %x\n", temp); - switch(machine_id) { - case ARCH_HEATHROW: /* OldWorld */ + ram_size = ofmem->ramsize; - /* model */ + printk("Memory: %lldM\n", ram_size / 1024 / 1024); - push_str("Power Macintosh"); - fword("model"); + fw_cfg_read(FW_CFG_UUID, qemu_uuid, 16); - /* compatible */ + printk("UUID: " UUID_FMT "\n", qemu_uuid[0], qemu_uuid[1], qemu_uuid[2], + qemu_uuid[3], qemu_uuid[4], qemu_uuid[5], qemu_uuid[6], + qemu_uuid[7], qemu_uuid[8], qemu_uuid[9], qemu_uuid[10], + qemu_uuid[11], qemu_uuid[12], qemu_uuid[13], qemu_uuid[14], + qemu_uuid[15]); - push_str("AAPL,PowerMac G3"); - fword("encode-string"); - push_str("MacRISC"); - fword("encode-string"); - fword("encode+"); - push_str("compatible"); - fword("property"); + /* set device tree root info */ - /* misc */ + push_str("/"); + fword("find-device"); - push_str("device-tree"); - fword("encode-string"); - push_str("AAPL,original-name"); - fword("property"); + switch(machine_id) { + case ARCH_HEATHROW: /* OldWorld */ - PUSH(0); - fword("encode-int"); - push_str("AAPL,cpu-id"); - fword("property"); + /* model */ - PUSH(66 * 1000 * 1000); - fword("encode-int"); - push_str("clock-frequency"); - fword("property"); - break; + push_str("Power Macintosh"); + fword("model"); - case ARCH_MAC99: - case ARCH_MAC99_U3: - case ARCH_PREP: - default: + /* compatible */ + + push_str("AAPL,PowerMac G3"); + fword("encode-string"); + push_str("MacRISC"); + fword("encode-string"); + fword("encode+"); + push_str("compatible"); + fword("property"); - /* model */ + /* misc */ - push_str("PowerMac2,1"); - fword("model"); + push_str("device-tree"); + fword("encode-string"); + push_str("AAPL,original-name"); + fword("property"); - /* compatible */ + PUSH(0); + fword("encode-int"); + push_str("AAPL,cpu-id"); + fword("property"); - push_str("PowerMac2,1"); - fword("encode-string"); - push_str("MacRISC"); - fword("encode-string"); - fword("encode+"); - push_str("Power Macintosh"); - fword("encode-string"); - fword("encode+"); - push_str("compatible"); - fword("property"); + PUSH(66 * 1000 * 1000); + fword("encode-int"); + push_str("clock-frequency"); + fword("property"); + break; - /* misc */ + case ARCH_MAC99: + case ARCH_MAC99_U3: + case ARCH_PREP: + default: + + /* model */ + + push_str("PowerMac2,1"); + fword("model"); + + /* compatible */ + + push_str("PowerMac2,1"); + fword("encode-string"); + push_str("MacRISC"); + fword("encode-string"); + fword("encode+"); + push_str("Power Macintosh"); + fword("encode-string"); + fword("encode+"); + push_str("compatible"); + fword("property"); - push_str("bootrom"); - fword("device-type"); + /* misc */ - PUSH(100 * 1000 * 1000); - fword("encode-int"); - push_str("clock-frequency"); - fword("property"); - break; - } + push_str("bootrom"); + fword("device-type"); - /* Perhaps we can store UUID here ? */ + PUSH(100 * 1000 * 1000); + fword("encode-int"); + push_str("clock-frequency"); + fword("property"); + break; + } - push_str("0000000000000"); - fword("encode-string"); - push_str("system-id"); - fword("property"); + /* Perhaps we can store UUID here ? */ - /* memory info */ + push_str("0000000000000"); + fword("encode-string"); + push_str("system-id"); + fword("property"); - push_str("/memory"); - fword("find-device"); + /* memory info */ - /* all memory */ + push_str("/memory"); + fword("find-device"); - /* TODO Adjust this when #address-cells gets increased for ppc64. */ - PUSH(0); - fword("encode-phys"); - /* This needs adjusting if #size-cells gets increased. - Alternatively use multiple (address, size) tuples. */ - PUSH(ram_size & 0xffffffff); - fword("encode-int"); - fword("encode+"); - push_str("reg"); - fword("property"); + /* all memory */ - cpu = id_cpu(); - cpu->initfn(cpu); - printk("CPU type %s\n", cpu->name); + /* TODO Adjust this when #address-cells gets increased for ppc64. */ + PUSH(0); + fword("encode-phys"); + /* This needs adjusting if #size-cells gets increased. + Alternatively use multiple (address, size) tuples. */ + PUSH(ram_size & 0xffffffff); + fword("encode-int"); + fword("encode+"); + push_str("reg"); + fword("property"); - snprintf(buf, sizeof(buf), "/cpus/%s", cpu->name); - ofmem_register(find_dev("/memory"), find_dev(buf)); - node_methods_init(buf); + cpu = id_cpu(); + cpu->initfn(cpu); + printk("CPU type %s\n", cpu->name); + + snprintf(buf, sizeof(buf), "/cpus/%s", cpu->name); + ofmem_register(find_dev("/memory"), find_dev(buf)); + node_methods_init(buf); #ifdef CONFIG_RTAS - /* OldWorld Macs don't have an /rtas node. */ - switch (machine_id) { - case ARCH_MAC99: - case ARCH_MAC99_U3: - if (!(ph = find_dev("/rtas"))) { - printk("Warning: No /rtas node\n"); - } else { - unsigned long size = 0x1000; - while (size < (unsigned long)of_rtas_end - (unsigned long)of_rtas_start) - size *= 2; - set_property(ph, "rtas-size", (char*)&size, sizeof(size)); - set_int_property(ph, "rtas-version", is_apple() ? 0x41 : 1); - } - break; - } + /* OldWorld Macs don't have an /rtas node. */ + switch (machine_id) { + case ARCH_MAC99: + case ARCH_MAC99_U3: + if (!(ph = find_dev("/rtas"))) { + printk("Warning: No /rtas node\n"); + } else { + unsigned long size = 0x1000; + while (size < (unsigned long)of_rtas_end - (unsigned long)of_rtas_start) + size *= 2; + set_property(ph, "rtas-size", (char*)&size, sizeof(size)); + set_int_property(ph, "rtas-version", is_apple() ? 0x41 : 1); + } + break; + } #endif - if (fw_cfg_read_i16(FW_CFG_NOGRAPHIC)) { - if (CONFIG_SERIAL_PORT) { - stdin_path = "scca"; - stdout_path = "scca"; - } else { - stdin_path = "sccb"; - stdout_path = "sccb"; - } - - /* Some bootloaders force the output to the screen device, so - let's create a screen alias for the serial device too */ - push_str("/aliases"); - fword("find-device"); - - push_str(stdout_path); - fword("pathres-resolve-aliases"); - fword("encode-string"); - push_str("screen"); - fword("property"); + if (fw_cfg_read_i16(FW_CFG_NOGRAPHIC)) { + if (CONFIG_SERIAL_PORT) { + stdin_path = "scca"; + stdout_path = "scca"; } else { - stdin_path = "adb-keyboard"; - stdout_path = "screen"; + stdin_path = "sccb"; + stdout_path = "sccb"; } - kvm_of_init(); + /* Some bootloaders force the output to the screen device, so + let's create a screen alias for the serial device too */ - /* Setup nvram variables */ - push_str("/options"); + push_str("/aliases"); fword("find-device"); - uint16_t boot_device = fw_cfg_read_i16(FW_CFG_BOOT_DEVICE); - switch (boot_device) { - case 'c': - boot_path = "hd"; - break; - default: - case 'd': - boot_path = "cd"; - break; - } - - /* Setup default boot devices */ - snprintf(buf, sizeof(buf), "%s:,\\\\:tbxi %s:,\\ppc\\bootinfo.txt", boot_path, boot_path); - push_str(buf); - fword("encode-string"); - push_str("boot-device"); - fword("property"); + push_str(stdout_path); + fword("pathres-resolve-aliases"); + fword("encode-string"); + push_str("screen"); + fword("property"); + } else { + stdin_path = "adb-keyboard"; + stdout_path = "screen"; + } - /* Set up other properties */ - push_str("/chosen"); - fword("find-device"); + kvm_of_init(); - push_str(stdin_path); - fword("open-dev"); - fword("encode-int"); - push_str("stdin"); - fword("property"); + /* Setup nvram variables */ + push_str("/options"); + fword("find-device"); - push_str(stdout_path); - fword("open-dev"); - fword("encode-int"); - push_str("stdout"); - fword("property"); + uint16_t boot_device = fw_cfg_read_i16(FW_CFG_BOOT_DEVICE); + switch (boot_device) { + case 'c': + boot_path = "hd"; + break; + default: + case 'd': + boot_path = "cd"; + break; + } - push_str(stdin_path); - fword("pathres-resolve-aliases"); - push_str("input-device"); - fword("$setenv"); + /* Setup default boot devices */ + snprintf(buf, sizeof(buf), "%s:,\\\\:tbxi %s:,\\ppc\\bootinfo.txt", boot_path, boot_path); + push_str(buf); + fword("encode-string"); + push_str("boot-device"); + fword("property"); - push_str(stdout_path); - fword("pathres-resolve-aliases"); - push_str("output-device"); - fword("$setenv"); + /* Set up other properties */ - push_str(stdin_path); - fword("input"); + push_str("/chosen"); + fword("find-device"); - push_str(stdout_path); - fword("output"); + 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"); + + push_str(stdout_path); + fword("pathres-resolve-aliases"); + 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 ) + if(getbool("tty-interface?") == 1) #endif - fword("activate-tty-interface"); + fword("activate-tty-interface"); - device_end(); + device_end(); - bind_func("platform-boot", boot ); - bind_func("(go)", go); + bind_func("platform-boot", boot); + bind_func("(go)", go); } Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sat Nov 27 01:46:44 2010 (r970) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sat Nov 27 17:29:32 2010 (r971) @@ -23,12 +23,12 @@ #include "mmutypes.h" #include "asm/processor.h" -#define BIT(n) (1U<<(31-(n))) +#define BIT(n) (1U << (31 - (n))) /* called from assembly */ -extern void dsi_exception( void ); -extern void isi_exception( void ); -extern void setup_mmu( unsigned long code_base ); +extern void dsi_exception(void); +extern void isi_exception(void); +extern void setup_mmu(unsigned long code_base); /* * From Apple's BootX source comments: @@ -60,98 +60,98 @@ #define SEGR_BASE 0x0400 static inline unsigned long -get_hash_base( void ) +get_hash_base(void) { return (mfsdr1() & SDR1_HTABORG_MASK); } static inline unsigned long -get_rom_base( void ) +get_rom_base(void) { - ofmem_t *ofmem = ofmem_arch_get_private(); - return ofmem->ramsize - 0x00100000; + ofmem_t *ofmem = ofmem_arch_get_private(); + return ofmem->ramsize - 0x00100000; } unsigned long -get_ram_top( void ) +get_ram_top(void) { - return get_hash_base() - (32 + 64 + 64) * 1024 - OFMEM_SIZE; + return get_hash_base() - (32 + 64 + 64) * 1024 - OFMEM_SIZE; } unsigned long -get_ram_bottom( void ) +get_ram_bottom(void) { - return (unsigned long)FREE_BASE; + return (unsigned long)FREE_BASE; } -static ucell get_heap_top( void ) +static ucell get_heap_top(void) { - return get_hash_base() - (32 + 64 + 64) * 1024; + return get_hash_base() - (32 + 64 + 64) * 1024; } static inline size_t ALIGN_SIZE(size_t x, size_t a) { - return (x + a - 1) & ~(a-1); + return (x + a - 1) & ~(a - 1); } ofmem_t* ofmem_arch_get_private(void) { - return (ofmem_t*)cell2pointer(get_heap_top() - OFMEM_SIZE); + return (ofmem_t*)cell2pointer(get_heap_top() - OFMEM_SIZE); } void* ofmem_arch_get_malloc_base(void) { - return (char*)ofmem_arch_get_private() + ALIGN_SIZE(sizeof(ofmem_t), 4); + return (char*)ofmem_arch_get_private() + ALIGN_SIZE(sizeof(ofmem_t), 4); } ucell ofmem_arch_get_heap_top(void) { - return get_heap_top(); + return get_heap_top(); } ucell ofmem_arch_get_virt_top(void) { - return IO_BASE; + return IO_BASE; } void ofmem_arch_unmap_pages(ucell virt, ucell size) { - /* kill page mappings in provided range */ + /* kill page mappings in provided range */ } void ofmem_arch_early_map_pages(ucell phys, ucell virt, ucell size, ucell mode) { - /* none yet */ + /* none yet */ } retain_t *ofmem_arch_get_retained(void) { - /* not implemented */ - return NULL; + /* not implemented */ + return NULL; } +/* Return size of a single MMU package translation property entry in cells */ int ofmem_arch_get_translation_entry_size(void) { - /* Return size of a single MMU package translation property entry in cells */ - return 4; + return 4; } +/* Generate translation property entry for PPC. + * According to the platform bindings for PPC + * (http://playground.sun.com/1275/bindings/ppc/release/ppc-2_1.html#REF34579) + * a translation property entry has the following layout: + * + * virtual address + * length + * physical address + * mode + */ void ofmem_arch_create_translation_entry(ucell *transentry, translation_t *t) { - /* Generate translation property entry for PPC. According to the - platform bindings for PPC (http://playground.sun.com/1275/bindings/ppc/release/ppc-2_1.html#REF34579) - a translation property entry has the following layout: - - virtual address - length - physical address - mode - */ - - transentry[0] = t->virt; - transentry[1] = t->size; - transentry[2] = t->phys; - transentry[3] = t->mode; + transentry[0] = t->virt; + transentry[1] = t->size; + transentry[2] = t->phys; + transentry[3] = t->mode; } /************************************************************************/ @@ -159,21 +159,21 @@ /************************************************************************/ void * -malloc( int size ) +malloc(int size) { - return ofmem_malloc(size); + return ofmem_malloc(size); } void -free( void *ptr ) +free(void *ptr) { - ofmem_free(ptr); + ofmem_free(ptr); } void * -realloc( void *ptr, size_t size ) +realloc(void *ptr, size_t size) { - return ofmem_realloc(ptr, size); + return ofmem_realloc(ptr, size); } @@ -181,12 +181,12 @@ /* misc */ /************************************************************************/ -ucell ofmem_arch_default_translation_mode( ucell phys ) +ucell ofmem_arch_default_translation_mode(ucell phys) { - /* XXX: Guard bit not set as it should! */ - if( phys < IO_BASE ) - return 0x02; /*0xa*/ /* wim GxPp */ - return 0x6a; /* WIm GxPp, I/O */ + /* XXX: Guard bit not set as it should! */ + if (phys < IO_BASE) + return 0x02; /*0xa*/ /* wim GxPp */ + return 0x6a; /* WIm GxPp, I/O */ } @@ -195,185 +195,185 @@ /************************************************************************/ static ucell -ea_to_phys( ucell ea, ucell *mode ) +ea_to_phys(ucell ea, ucell *mode) { - ucell phys; + ucell phys; - if (ea >= OF_CODE_START) { - /* ROM into RAM */ - ea -= OF_CODE_START; - phys = get_rom_base() + ea; - *mode = 0x02; + if (ea >= OF_CODE_START) { + /* ROM into RAM */ + ea -= OF_CODE_START; + phys = get_rom_base() + ea; + *mode = 0x02; return phys; - } + } - phys = ofmem_translate(ea, mode); - if( phys == -1 ) { - phys = ea; - *mode = ofmem_arch_default_translation_mode( phys ); - - /* print_virt_range(); */ - /* print_phys_range(); */ - /* print_trans(); */ - } - return phys; + phys = ofmem_translate(ea, mode); + if (phys == -1) { + phys = ea; + *mode = ofmem_arch_default_translation_mode(phys); + + /* print_virt_range(); */ + /* print_phys_range(); */ + /* print_trans(); */ + } + return phys; } static void -hash_page_64( ucell ea, ucell phys, ucell mode ) +hash_page_64(ucell ea, ucell phys, ucell mode) { - static int next_grab_slot=0; - uint64_t vsid_mask, page_mask, pgidx, hash; - uint64_t htab_mask, mask, avpn; - unsigned long pgaddr; - int i, found; - unsigned int vsid, vsid_sh, sdr, sdr_sh, sdr_mask; - mPTE_64_t *pp; - - vsid = (ea >> 28) + SEGR_BASE; - vsid_sh = 7; - vsid_mask = 0x00003FFFFFFFFF80ULL; - sdr = mfsdr1(); - sdr_sh = 18; - sdr_mask = 0x3FF80; - page_mask = 0x0FFFFFFF; // XXX correct? - pgidx = (ea & page_mask) >> PAGE_SHIFT; - avpn = (vsid << 12) | ((pgidx >> 4) & 0x0F80);; - - hash = ((vsid ^ pgidx) << vsid_sh) & vsid_mask; - htab_mask = 0x0FFFFFFF >> (28 - (sdr & 0x1F)); - mask = (htab_mask << sdr_sh) | sdr_mask; - pgaddr = sdr | (hash & mask); - pp = (mPTE_64_t *)pgaddr; - - /* replace old translation */ - for( found=0, i=0; !found && i<8; i++ ) - if( pp[i].avpn == avpn ) - found=1; - - /* otherwise use a free slot */ - for( i=0; !found && i<8; i++ ) - if( !pp[i].v ) - found=1; - - /* out of slots, just evict one */ - if( !found ) { - i = next_grab_slot + 1; - next_grab_slot = (next_grab_slot + 1) % 8; - } - i--; - { - mPTE_64_t p = { - // .avpn_low = avpn, - .avpn = avpn >> 7, - .h = 0, - .v = 1, - - .rpn = (phys & ~0xfff) >> 12, - .r = mode & (1 << 8) ? 1 : 0, - .c = mode & (1 << 7) ? 1 : 0, - .w = mode & (1 << 6) ? 1 : 0, - .i = mode & (1 << 5) ? 1 : 0, - .m = mode & (1 << 4) ? 1 : 0, - .g = mode & (1 << 3) ? 1 : 0, - .n = mode & (1 << 2) ? 1 : 0, - .pp = mode & 3, - }; - pp[i] = p; - } + static int next_grab_slot = 0; + uint64_t vsid_mask, page_mask, pgidx, hash; + uint64_t htab_mask, mask, avpn; + unsigned long pgaddr; + int i, found; + unsigned int vsid, vsid_sh, sdr, sdr_sh, sdr_mask; + mPTE_64_t *pp; + + vsid = (ea >> 28) + SEGR_BASE; + vsid_sh = 7; + vsid_mask = 0x00003FFFFFFFFF80ULL; + sdr = mfsdr1(); + sdr_sh = 18; + sdr_mask = 0x3FF80; + page_mask = 0x0FFFFFFF; // XXX correct? + pgidx = (ea & page_mask) >> PAGE_SHIFT; + avpn = (vsid << 12) | ((pgidx >> 4) & 0x0F80);; + + hash = ((vsid ^ pgidx) << vsid_sh) & vsid_mask; + htab_mask = 0x0FFFFFFF >> (28 - (sdr & 0x1F)); + mask = (htab_mask << sdr_sh) | sdr_mask; + pgaddr = sdr | (hash & mask); + pp = (mPTE_64_t *)pgaddr; + + /* replace old translation */ + for (found = 0, i = 0; !found && i < 8; i++) + if (pp[i].avpn == avpn) + found = 1; + + /* otherwise use a free slot */ + for (i = 0; !found && i < 8; i++) + if (!pp[i].v) + found = 1; + + /* out of slots, just evict one */ + if (!found) { + i = next_grab_slot + 1; + next_grab_slot = (next_grab_slot + 1) % 8; + } + i--; + { + mPTE_64_t p = { + // .avpn_low = avpn, + .avpn = avpn >> 7, + .h = 0, + .v = 1, + + .rpn = (phys & ~0xfff) >> 12, + .r = mode & (1 << 8) ? 1 : 0, + .c = mode & (1 << 7) ? 1 : 0, + .w = mode & (1 << 6) ? 1 : 0, + .i = mode & (1 << 5) ? 1 : 0, + .m = mode & (1 << 4) ? 1 : 0, + .g = mode & (1 << 3) ? 1 : 0, + .n = mode & (1 << 2) ? 1 : 0, + .pp = mode & 3, + }; + pp[i] = p; + } - asm volatile( "tlbie %0" :: "r"(ea) ); + asm volatile("tlbie %0" :: "r"(ea)); } static void -hash_page_32( ucell ea, ucell phys, ucell mode ) +hash_page_32(ucell ea, ucell phys, ucell mode) { #ifndef __powerpc64__ - static int next_grab_slot=0; - unsigned long *upte, cmp, hash1; - int i, vsid, found; - mPTE_t *pp; - - vsid = (ea>>28) + SEGR_BASE; - cmp = BIT(0) | (vsid << 7) | ((ea & 0x0fffffff) >> 22); - - hash1 = vsid; - hash1 ^= (ea >> 12) & 0xffff; - hash1 &= (((mfsdr1() & 0x1ff) << 16) | 0xffff) >> 6; - - pp = (mPTE_t*)(get_hash_base() + (hash1 << 6)); - upte = (unsigned long*)pp; - - /* replace old translation */ - for( found=0, i=0; !found && i<8; i++ ) - if( cmp == upte[i*2] ) - found=1; - - /* otherwise use a free slot */ - for( i=0; !found && i<8; i++ ) - if( !pp[i].v ) - found=1; - - /* out of slots, just evict one */ - if( !found ) { - i = next_grab_slot + 1; - next_grab_slot = (next_grab_slot + 1) % 8; - } - i--; - upte[i*2] = cmp; - upte[i*2+1] = (phys & ~0xfff) | mode; + static int next_grab_slot = 0; + unsigned long *upte, cmp, hash1; + int i, vsid, found; + mPTE_t *pp; + + vsid = (ea >> 28) + SEGR_BASE; + cmp = BIT(0) | (vsid << 7) | ((ea & 0x0fffffff) >> 22); + + hash1 = vsid; + hash1 ^= (ea >> 12) & 0xffff; + hash1 &= (((mfsdr1() & 0x1ff) << 16) | 0xffff) >> 6; + + pp = (mPTE_t*)(get_hash_base() + (hash1 << 6)); + upte = (unsigned long*)pp; + + /* replace old translation */ + for (found = 0, i = 0; !found && i < 8; i++) + if (cmp == upte[i*2]) + found = 1; + + /* otherwise use a free slot */ + for (i = 0; !found && i < 8; i++) + if (!pp[i].v) + found = 1; + + /* out of slots, just evict one */ + if (!found) { + i = next_grab_slot + 1; + next_grab_slot = (next_grab_slot + 1) % 8; + } + i--; + upte[i * 2] = cmp; + upte[i * 2 + 1] = (phys & ~0xfff) | mode; - asm volatile( "tlbie %0" :: "r"(ea) ); + asm volatile("tlbie %0" :: "r"(ea)); #endif } static int is_ppc64(void) { #ifdef __powerpc64__ - return 1; + return 1; #elif defined(CONFIG_PPC_64BITSUPPORT) - unsigned int pvr = mfpvr(); - return ((pvr >= 0x330000) && (pvr < 0x70330000)); + unsigned int pvr = mfpvr(); + return ((pvr >= 0x330000) && (pvr < 0x70330000)); #else - return 0; + return 0; #endif } /* XXX Remove these ugly constructs when legacy 64-bit support is dropped. */ -static void hash_page( unsigned long ea, unsigned long phys, ucell mode ) +static void hash_page(unsigned long ea, unsigned long phys, ucell mode) { - if ( is_ppc64() ) - hash_page_64(ea, phys, mode); - else - hash_page_32(ea, phys, mode); + if (is_ppc64()) + hash_page_64(ea, phys, mode); + else + hash_page_32(ea, phys, mode); } void -dsi_exception( void ) +dsi_exception(void) { - unsigned long dar, dsisr; - ucell mode; - ucell phys; + unsigned long dar, dsisr; + ucell mode; + ucell phys; - asm volatile("mfdar %0" : "=r" (dar) : ); - asm volatile("mfdsisr %0" : "=r" (dsisr) : ); + asm volatile("mfdar %0" : "=r" (dar) : ); + asm volatile("mfdsisr %0" : "=r" (dsisr) : ); - phys = ea_to_phys(dar, &mode); - hash_page( dar, phys, mode ); + phys = ea_to_phys(dar, &mode); + hash_page(dar, phys, mode); } void -isi_exception( void ) +isi_exception(void) { - unsigned long nip, srr1; - ucell mode; - ucell phys; + unsigned long nip, srr1; + ucell mode; + ucell phys; - asm volatile("mfsrr0 %0" : "=r" (nip) : ); - asm volatile("mfsrr1 %0" : "=r" (srr1) : ); + asm volatile("mfsrr0 %0" : "=r" (nip) : ); + asm volatile("mfsrr1 %0" : "=r" (srr1) : ); - phys = ea_to_phys(nip, &mode); - hash_page( nip, phys, mode ); + phys = ea_to_phys(nip, &mode); + hash_page(nip, phys, mode); } @@ -382,69 +382,69 @@ /************************************************************************/ void -setup_mmu( unsigned long ramsize ) +setup_mmu(unsigned long ramsize) { - ofmem_t *ofmem; + ofmem_t *ofmem; #ifndef __powerpc64__ - unsigned long sr_base; + unsigned long sr_base; #endif - unsigned long hash_base; - unsigned long hash_mask = ~0x000fffffUL; /* alignment for ppc64 */ - int i; - - /* SDR1: Storage Description Register 1 */ - - hash_base = (ramsize - 0x00100000 - HASH_SIZE) & hash_mask; - memset((void *)hash_base, 0, HASH_SIZE); - if (is_ppc64()) - mtsdr1(hash_base | MAX(HASH_BITS - 18, 0)); - else - mtsdr1(hash_base | ((HASH_SIZE - 1) >> 16)); + unsigned long hash_base; + unsigned long hash_mask = ~0x000fffffUL; /* alignment for ppc64 */ + int i; + + /* SDR1: Storage Description Register 1 */ + + hash_base = (ramsize - 0x00100000 - HASH_SIZE) & hash_mask; + memset((void *)hash_base, 0, HASH_SIZE); + if (is_ppc64()) + mtsdr1(hash_base | MAX(HASH_BITS - 18, 0)); + else + mtsdr1(hash_base | ((HASH_SIZE - 1) >> 16)); #ifdef __powerpc64__ - /* Segment Lookaside Buffer */ + /* Segment Lookaside Buffer */ - slbia(); /* Invalidate all SLBs except SLB 0 */ - for (i = 0; i < 16; i++) { - unsigned long rs = ((0x400 + i) << 12) | (0x10 << 7); - unsigned long rb = ((unsigned long)i << 28) | (1 << 27) | i; - slbmte(rs, rb); - } + slbia(); /* Invalidate all SLBs except SLB 0 */ + for (i = 0; i < 16; i++) { + unsigned long rs = ((0x400 + i) << 12) | (0x10 << 7); + unsigned long rb = ((unsigned long)i << 28) | (1 << 27) | i; + slbmte(rs, rb); + } #else - /* Segment Register */ + /* Segment Register */ - sr_base = SEGR_USER | SEGR_BASE ; - for( i=0; i<16; i++ ) { - int j = i << 28; - asm volatile("mtsrin %0,%1" :: "r" (sr_base + i), "r" (j) ); - } + sr_base = SEGR_USER | SEGR_BASE ; + for (i = 0; i < 16; i++) { + int j = i << 28; + asm volatile("mtsrin %0,%1" :: "r" (sr_base + i), "r" (j)); + } #endif - ofmem = ofmem_arch_get_private(); - memset(ofmem, 0, sizeof(ofmem_t)); - ofmem->ramsize = ramsize; + ofmem = ofmem_arch_get_private(); + memset(ofmem, 0, sizeof(ofmem_t)); + ofmem->ramsize = ramsize; - memcpy((void *)get_rom_base(), (void *)OF_CODE_START, 0x00100000); + memcpy((void *)get_rom_base(), (void *)OF_CODE_START, 0x00100000); - /* Enable MMU */ + /* Enable MMU */ - mtmsr(mfmsr() | MSR_IR | MSR_DR); + mtmsr(mfmsr() | MSR_IR | MSR_DR); } void -ofmem_init( void ) +ofmem_init(void) { - ofmem_t *ofmem = ofmem_arch_get_private(); + ofmem_t *ofmem = ofmem_arch_get_private(); - ofmem_claim_phys(0, get_ram_bottom(), 0); - ofmem_claim_virt(0, get_ram_bottom(), 0); - ofmem_map( 0, 0, get_ram_bottom(), 0 ); + ofmem_claim_phys(0, get_ram_bottom(), 0); + ofmem_claim_virt(0, get_ram_bottom(), 0); + ofmem_map(0, 0, get_ram_bottom(), 0); - ofmem_claim_phys(get_ram_top(), ofmem->ramsize - get_ram_top(), 0); - ofmem_claim_virt(get_ram_top(), ofmem->ramsize - get_ram_top(), 0); - ofmem_map( get_ram_top(), get_ram_top(), ofmem->ramsize - get_ram_top(), 0); + ofmem_claim_phys(get_ram_top(), ofmem->ramsize - get_ram_top(), 0); + ofmem_claim_virt(get_ram_top(), ofmem->ramsize - get_ram_top(), 0); + ofmem_map(get_ram_top(), get_ram_top(), ofmem->ramsize - get_ram_top(), 0); }

1 0

[commit] r970 - trunk/openbios-devel/arch/ppc/qemu
by repository service 27 Nov '10

27 Nov '10

Author: afaerber Date: Sat Nov 27 01:46:44 2010 New Revision: 970 URL: http://tracker.coreboot.org/trac/openbios/changeset/970 Log: ppc: Use mfpvr() for device tree init This also accounts for the fact that the PVR is 32 bits on ppc64. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Thu Nov 25 22:56:23 2010 (r969) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sat Nov 27 01:46:44 2010 (r970) @@ -193,8 +193,6 @@ static void cpu_generic_init(const struct cpudef *cpu) { - unsigned long iu_version; - push_str("/cpus"); fword("find-device"); @@ -206,9 +204,7 @@ push_str("cpu"); fword("device-type"); - asm("mfpvr %0\n" - : "=r"(iu_version) :); - PUSH(iu_version); + PUSH(mfpvr()); fword("encode-int"); push_str("cpu-version"); fword("property");

1 0

Q: How to "squeeze" C functions in between two symbols?
by Andreas Färber 25 Nov '10

25 Nov '10

Hello, I've gotten AIX 6/7 to instantiate RTAS (patches upcoming) and would like to trace what it's trying to do. I probably need to implement the display-character token. The RTAS code in arch/ppc/qemu/start.S currently looks like this: GLOBL(of_rtas_start): blr GLOBL(of_rtas_end): ...and I would like to branch to C code from there. Is there a way to have code from, say, rtas.c go between the blr and of_rtas_end symbol? Or do I need to move the symbols to the ldscript and place the code in a special section? If yes, how? Those symbols are being used for code size calculation and relocation in arch/ppc/qemu/methods.c. Thanks, Andreas

7 97

[commit] r968 - in trunk/openbios-devel: arch/ppc/qemu include/arch/ppc
by repository service 25 Nov '10

25 Nov '10

Author: afaerber Date: Thu Nov 25 22:53:25 2010 New Revision: 968 URL: http://tracker.coreboot.org/trac/openbios/changeset/968 Log: ppc: Dereference function descriptors on ppc64 In the ppc64 ELF ABI, similar to ia64, a function's symbol does not directly precede its machine instructions. For ppc64 it consists of a triple of entry point, TOC base and environment pointer. Introduce macros to facilitate handling this. Names suggested by Blue. Deliberately don't touch the client interface yet, as there's more work to do. Cc: Alexander Graf <agraf(a)suse.de> Cc: Blue Swirl <blauwirbel(a)gmail.com> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/arch/ppc/qemu/start.S trunk/openbios-devel/include/arch/ppc/asmdefs.h Modified: trunk/openbios-devel/arch/ppc/qemu/start.S ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/start.S Mon Nov 22 21:00:13 2010 (r967) +++ trunk/openbios-devel/arch/ppc/qemu/start.S Thu Nov 25 22:53:25 2010 (r968) @@ -271,13 +271,13 @@ b 1b call_dsi_exception: - LOAD_REG_IMMEDIATE(r3, dsi_exception) + LOAD_REG_FUNC(r3, dsi_exception) mtctr r3 bctrl b exception_return call_isi_exception: - LOAD_REG_IMMEDIATE(r3, isi_exception) + LOAD_REG_FUNC(r3, isi_exception) mtctr r3 bctrl b exception_return @@ -289,7 +289,7 @@ __divide_error: trap_error: mflr r3 - b unexpected_excep + b BRANCH_LABEL(unexpected_excep) VECTOR( 0x100, "SRE" ): b _entry @@ -445,8 +445,8 @@ /* save memory size in stack */ - bl setup_mmu - bl entry + bl BRANCH_LABEL(setup_mmu) + bl BRANCH_LABEL(entry) 1: nop b 1b Modified: trunk/openbios-devel/include/arch/ppc/asmdefs.h ============================================================================== --- trunk/openbios-devel/include/arch/ppc/asmdefs.h Mon Nov 22 21:00:13 2010 (r967) +++ trunk/openbios-devel/include/arch/ppc/asmdefs.h Thu Nov 25 22:53:25 2010 (r968) @@ -76,24 +76,37 @@ /************************************************************************/ #ifdef __powerpc64__ + #define LOAD_REG_IMMEDIATE(D, x) \ lis (D), (x)@highest ; \ ori (D), (D), (x)@higher ; \ sldi (D), (D), 32 ; \ oris (D), (D), (x)@h ; \ ori (D), (D), (x)@l + +#define LOAD_REG_FUNC(D, x) \ + LOAD_REG_IMMEDIATE((D), (x)) ; \ + ld (D), 0(D) + #else + #define LOAD_REG_IMMEDIATE(D, x) \ lis (D), HA(x) ; \ addi (D), (D), LO(x) + +#define LOAD_REG_FUNC(D, x) \ + LOAD_REG_IMMEDIATE((D), (x)) + #endif #ifdef __powerpc64__ #define RFI rfid #define MTMSRD(r) mtmsrd r +#define BRANCH_LABEL(name) . ## name #else #define RFI rfi #define MTMSRD(r) mtmsr r +#define BRANCH_LABEL(name) name #endif #ifndef __darwin__

1 0

[PATCH] ppc: SDR1 fixes for ppc64
by Andreas Färber 22 Nov '10

22 Nov '10

Adjust shifts and masks to 64-bit SDR1. Cc: Alexander Graf <agraf(a)suse.de> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> --- arch/ppc/qemu/ofmem.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/ppc/qemu/ofmem.c b/arch/ppc/qemu/ofmem.c index fd417c2..9c60841 100644 --- a/arch/ppc/qemu/ofmem.c +++ b/arch/ppc/qemu/ofmem.c @@ -61,7 +61,7 @@ get_hash_base( void ) asm volatile("mfsdr1 %0" : "=r" (sdr1) ); - return (sdr1 & 0xffff0000); + return (sdr1 & ~0xffffUL); } static inline unsigned long @@ -71,7 +71,7 @@ get_hash_size( void ) asm volatile("mfsdr1 %0" : "=r" (sdr1) ); - return ((sdr1 << 16) | 0x0000ffff) + 1; + return (((sdr1 & 0x1f) << 16) | 0x0000ffff) + 1; } static inline unsigned long -- 1.7.3

3 25

[commit] r967 - in trunk/openbios-devel: arch/ppc/qemu include/arch/ppc
by repository service 22 Nov '10

22 Nov '10

Author: afaerber Date: Mon Nov 22 21:00:13 2010 New Revision: 967 URL: http://tracker.coreboot.org/trac/openbios/changeset/967 Log: ppc: SDR1 fixes Clean up use of SDR1 fields. IBM's "The Programming Environments for 32-Bit Microprocessors": The HTABMASK field in SDR1 contains a mask value that determines how many bits from the hash are used in the page table index. This mask must be of the form 0b00...011...1; that is, a string of 0 bits followed by a string of 1bits. The 1 bits determine how many additional bits (at least 10) from the hash are used in the index; HTABORG must have this same number of low-order bits equal to 0. IBM's "The Programming Environments Manual for 64-bit Microprocessors" 3.0: The HTABSIZE field in SDR1 contains an integer value that determines how many bits from the hash are used in the page table index. This number must not exceed 28. HTABSIZE is used to generate a mask of the form 0b00...011...1; that is, a string of 0 bits followed by a string of 1-bits. The 1-bits determine how many additional bits (beyond the minimum of 11) from the hash are used in the index. The HTABORG must have this same number of low-order bits equal to 0. Adjust alignment mask and hash size for ppc64. Note that the page table does not yet scale with the memory size, and the secondary hash is not yet used. v5: * Move HTABORG mask to header. * Keep is_ppc64() for now, suggested by Alex. Merge CONFIG_PPC_64BITSUPPORT handling here so that it behaves as intended, not recognizing a ppc64 CPU in pure 32-bit mode. * Stub out hash_page_32() for ppc64 to avoid having to care about it for ppc64. hash_page_64() is less critical for pure ppc build since the code needs to be 32-bit compatible anyway. v4: * Don't redefine hash_page_{32,64} but add TODO comments for renaming. * Keep and simplify hash_page(). v3: * Fix shifts. Thanks to Segher and Alex. * Fix HTABSIZE for 32-bit ppc64: ((2 << 15) - 1) >> 16 happened to be 0, so that it worked as expected. Avoid underflow, spotted by Alex. Make this fix available for legacy 64-bit support as well. * Drop get_hash_size(). It was only used in hash_page_32() and caused unnecessary conversions between HTABMASK and size. * Introduce {mfsdr1,mtsdr1} as suggested by Alex. Note that this changes the volatility for hash_page_64(). * Conditionalize 64-bit support, drop 32-bit support for ppc64. * Adjust hash size for ppc64. v2: * Use HTABSIZE for ppc64, fix HTABMASK usage for ppc. Error spotted by Segher. Cc: Segher Boessenkool <segher(a)kernel.crashing.org> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c trunk/openbios-devel/include/arch/ppc/processor.h Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sun Nov 21 22:53:54 2010 (r966) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Mon Nov 22 21:00:13 2010 (r967) @@ -48,7 +48,12 @@ #define OF_CODE_START 0xfff00000UL #define IO_BASE 0x80000000 -#define HASH_SIZE (2 << 15) +#ifdef __powerpc64__ +#define HASH_BITS 18 +#else +#define HASH_BITS 15 +#endif +#define HASH_SIZE (2 << HASH_BITS) #define OFMEM_SIZE (2 * 1024 * 1024) #define SEGR_USER BIT(2) @@ -57,21 +62,7 @@ static inline unsigned long get_hash_base( void ) { - unsigned long sdr1; - - asm volatile("mfsdr1 %0" : "=r" (sdr1) ); - - return (sdr1 & 0xffff0000); -} - -static inline unsigned long -get_hash_size( void ) -{ - unsigned long sdr1; - - asm volatile("mfsdr1 %0" : "=r" (sdr1) ); - - return ((sdr1 << 16) | 0x0000ffff) + 1; + return (mfsdr1() & SDR1_HTABORG_MASK); } static inline unsigned long @@ -242,7 +233,7 @@ vsid = (ea >> 28) + SEGR_BASE; vsid_sh = 7; vsid_mask = 0x00003FFFFFFFFF80ULL; - asm ( "mfsdr1 %0" : "=r" (sdr) ); + sdr = mfsdr1(); sdr_sh = 18; sdr_mask = 0x3FF80; page_mask = 0x0FFFFFFF; // XXX correct? @@ -297,6 +288,7 @@ static void hash_page_32( ucell ea, ucell phys, ucell mode ) { +#ifndef __powerpc64__ static int next_grab_slot=0; unsigned long *upte, cmp, hash1; int i, vsid, found; @@ -307,7 +299,7 @@ hash1 = vsid; hash1 ^= (ea >> 12) & 0xffff; - hash1 &= (get_hash_size() - 1) >> 6; + hash1 &= (((mfsdr1() & 0x1ff) << 16) | 0xffff) >> 6; pp = (mPTE_t*)(get_hash_base() + (hash1 << 6)); upte = (unsigned long*)pp; @@ -332,14 +324,22 @@ upte[i*2+1] = (phys & ~0xfff) | mode; asm volatile( "tlbie %0" :: "r"(ea) ); +#endif } static int is_ppc64(void) { +#ifdef __powerpc64__ + return 1; +#elif defined(CONFIG_PPC_64BITSUPPORT) unsigned int pvr = mfpvr(); return ((pvr >= 0x330000) && (pvr < 0x70330000)); +#else + return 0; +#endif } +/* XXX Remove these ugly constructs when legacy 64-bit support is dropped. */ static void hash_page( unsigned long ea, unsigned long phys, ucell mode ) { if ( is_ppc64() ) @@ -385,20 +385,21 @@ setup_mmu( unsigned long ramsize ) { ofmem_t *ofmem; - unsigned long sdr1; #ifndef __powerpc64__ unsigned long sr_base; #endif unsigned long hash_base; - unsigned long hash_mask = 0xfff00000; /* alignment for ppc64 */ + unsigned long hash_mask = ~0x000fffffUL; /* alignment for ppc64 */ int i; /* SDR1: Storage Description Register 1 */ hash_base = (ramsize - 0x00100000 - HASH_SIZE) & hash_mask; memset((void *)hash_base, 0, HASH_SIZE); - sdr1 = hash_base | ((HASH_SIZE-1) >> 16); - asm volatile("mtsdr1 %0" :: "r" (sdr1) ); + if (is_ppc64()) + mtsdr1(hash_base | MAX(HASH_BITS - 18, 0)); + else + mtsdr1(hash_base | ((HASH_SIZE - 1) >> 16)); #ifdef __powerpc64__ Modified: trunk/openbios-devel/include/arch/ppc/processor.h ============================================================================== --- trunk/openbios-devel/include/arch/ppc/processor.h Sun Nov 21 22:53:54 2010 (r966) +++ trunk/openbios-devel/include/arch/ppc/processor.h Mon Nov 22 21:00:13 2010 (r967) @@ -425,6 +425,24 @@ #endif } +#ifdef __powerpc64__ +#define SDR1_HTABORG_MASK 0x3FFFFFFFFFFC0000UL +#else +#define SDR1_HTABORG_MASK 0xffff0000 +#endif + +static inline unsigned long mfsdr1(void) +{ + unsigned long sdr1; + asm volatile("mfsdr1 %0" : "=r" (sdr1)); + return sdr1; +} + +static inline void mtsdr1(unsigned long sdr1) +{ + asm volatile("mtsdr1 %0" :: "r" (sdr1)); +} + static inline unsigned int mfpvr(void) { unsigned int pvr;

1 0

[commit] r966 - in trunk/openbios-devel: arch/ppc/qemu include/arch/ppc
by repository service 21 Nov '10

21 Nov '10

Author: afaerber Date: Sun Nov 21 22:53:54 2010 New Revision: 966 URL: http://tracker.coreboot.org/trac/openbios/changeset/966 Log: ppc: Set up SLBs for ppc64 Set up SLBs with slbmte instead of mtsrin, suggested by Alex. v3: * Continue to use mtmsrin on ppc for simplicity. * Add comment on slbia, suggested by Segher. * Add inline functions {slbia,slbmte}, requested by Alex. * Add inline function mfpvr before Alex asks for it. :) v2: * Don't initialize 64 SLBs, then invalidate them, as in IBM's application note for the 970. Use slbia instead, recommended by Alex. * Conditionalize when to use SLB or SR. Cc: Segher Boessenkool <segher(a)kernel.crashing.org> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c trunk/openbios-devel/include/arch/ppc/processor.h Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sun Nov 21 20:20:54 2010 (r965) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sun Nov 21 22:53:54 2010 (r966) @@ -336,9 +336,7 @@ static int is_ppc64(void) { - unsigned int pvr; - asm volatile("mfspr %0, 0x11f" : "=r" (pvr) ); - + unsigned int pvr = mfpvr(); return ((pvr >= 0x330000) && (pvr < 0x70330000)); } @@ -387,7 +385,10 @@ setup_mmu( unsigned long ramsize ) { ofmem_t *ofmem; - unsigned long sdr1, sr_base; + unsigned long sdr1; +#ifndef __powerpc64__ + unsigned long sr_base; +#endif unsigned long hash_base; unsigned long hash_mask = 0xfff00000; /* alignment for ppc64 */ int i; @@ -399,6 +400,19 @@ sdr1 = hash_base | ((HASH_SIZE-1) >> 16); asm volatile("mtsdr1 %0" :: "r" (sdr1) ); +#ifdef __powerpc64__ + + /* Segment Lookaside Buffer */ + + slbia(); /* Invalidate all SLBs except SLB 0 */ + for (i = 0; i < 16; i++) { + unsigned long rs = ((0x400 + i) << 12) | (0x10 << 7); + unsigned long rb = ((unsigned long)i << 28) | (1 << 27) | i; + slbmte(rs, rb); + } + +#else + /* Segment Register */ sr_base = SEGR_USER | SEGR_BASE ; @@ -407,6 +421,8 @@ asm volatile("mtsrin %0,%1" :: "r" (sr_base + i), "r" (j) ); } +#endif + ofmem = ofmem_arch_get_private(); memset(ofmem, 0, sizeof(ofmem_t)); ofmem->ramsize = ramsize; Modified: trunk/openbios-devel/include/arch/ppc/processor.h ============================================================================== --- trunk/openbios-devel/include/arch/ppc/processor.h Sun Nov 21 20:20:54 2010 (r965) +++ trunk/openbios-devel/include/arch/ppc/processor.h Sun Nov 21 22:53:54 2010 (r966) @@ -425,6 +425,23 @@ #endif } +static inline unsigned int mfpvr(void) +{ + unsigned int pvr; + asm volatile("mfspr %0, 0x11f" : "=r" (pvr) ); + return pvr; +} + +static inline void slbia(void) +{ + asm volatile("slbia" ::: "memory"); +} + +static inline void slbmte(unsigned long rs, unsigned long rb) +{ + asm volatile("slbmte %0,%1 ; isync" :: "r" (rs), "r" (rb) : "memory"); +} + #endif /* !__ASSEMBLER__ */ #endif /* _H_PROCESSOR */

1 0

[PATCH] ppc: Move noreturn attribute
by Andreas Färber 21 Nov '10

21 Nov '10

Otherwise GCC 4.2.4 complains that panic() marked noreturn does return. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> --- arch/ppc/qemu/kernel.h | 2 +- arch/ppc/qemu/qemu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/ppc/qemu/kernel.h b/arch/ppc/qemu/kernel.h index e8ae364..fe9be83 100644 --- a/arch/ppc/qemu/kernel.h +++ b/arch/ppc/qemu/kernel.h @@ -17,7 +17,7 @@ /* misc.c */ extern void fatal_error( const char *str ); -extern void exit( int status ); +extern void exit( int status ) __attribute__ ((noreturn)); /* start.S */ extern void flush_icache_range( char *start, char *stop ); diff --git a/arch/ppc/qemu/qemu.c b/arch/ppc/qemu/qemu.c index 1f785ac..208669c 100644 --- a/arch/ppc/qemu/qemu.c +++ b/arch/ppc/qemu/qemu.c @@ -35,7 +35,7 @@ void exit( int status __attribute__ ((unused))) { for (;;); -} __attribute__ ((noreturn)) +} void fatal_error( const char *err ) -- 1.7.3

4 66

[commit] r965 - trunk/openbios-devel/include/arch/ppc
by repository service 21 Nov '10

21 Nov '10

Author: afaerber Date: Sun Nov 21 20:20:54 2010 New Revision: 965 URL: http://tracker.coreboot.org/trac/openbios/changeset/965 Log: ppc: Convert I/O macros to inline functions Suggested by Blue. Clean up function signatures while at it. v4: * Convert all I/O functions to use POSIX types for value. Suggested by Alex. v3: * Split off isa_io_base changes. v2: * Make port uint16_t, suggested by Alex. * Adapt isa_io_base for ppc64. Cc: Blue Swirl <blauwirbel(a)gmail.com> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/include/arch/ppc/io.h Modified: trunk/openbios-devel/include/arch/ppc/io.h ============================================================================== --- trunk/openbios-devel/include/arch/ppc/io.h Sun Nov 21 14:32:37 2010 (r964) +++ trunk/openbios-devel/include/arch/ppc/io.h Sun Nov 21 20:20:54 2010 (r965) @@ -17,89 +17,73 @@ extern unsigned long isa_io_base; /* - * The insw/outsw/insl/outsl macros don't do byte-swapping. - * They are only used in practice for transferring buffers which - * are arrays of bytes, and byte-swapping is not appropriate in - * that case. - paulus - */ -#define insw(port, buf, ns) _insw((uint16_t *)(uintptr_t)((port)+isa_io_base), (buf), (ns)) -#define outsw(port, buf, ns) _outsw((uint16_t *)(uintptr_t)((port)+isa_io_base), (buf), (ns)) - -#define inb(port) in_8((uint8_t *)(uintptr_t)((port)+isa_io_base)) -#define outb(val, port) out_8((uint8_t *)(uintptr_t)((port)+isa_io_base), (val)) -#define inw(port) in_le16((uint16_t *)(uintptr_t)((port)+isa_io_base)) -#define outw(val, port) out_le16((uint16_t *)(uintptr_t)((port)+isa_io_base), (val)) -#define inl(port) in_le32((uint32_t *)(uintptr_t)((port)+isa_io_base)) -#define outl(val, port) out_le32((uint32_t *)(uintptr_t)((port)+isa_io_base), (val)) - -/* * 8, 16 and 32 bit, big and little endian I/O operations, with barrier. */ -static inline int in_8(volatile unsigned char *addr) +static inline uint8_t in_8(volatile uint8_t *addr) { - int ret; + uint8_t ret; __asm__ __volatile__("lbz%U1%X1 %0,%1; eieio":"=r"(ret):"m"(*addr)); return ret; } -static inline void out_8(volatile unsigned char *addr, int val) +static inline void out_8(volatile uint8_t *addr, uint8_t val) { __asm__ __volatile__("stb%U0%X0 %1,%0; eieio":"=m"(*addr):"r"(val)); } -static inline int in_le16(volatile unsigned short *addr) +static inline uint16_t in_le16(volatile uint16_t *addr) { - int ret; + uint16_t ret; __asm__ __volatile__("lhbrx %0,0,%1; eieio":"=r"(ret): "r"(addr), "m"(*addr)); return ret; } -static inline int in_be16(volatile unsigned short *addr) +static inline uint16_t in_be16(volatile uint16_t *addr) { - int ret; + uint16_t ret; __asm__ __volatile__("lhz%U1%X1 %0,%1; eieio":"=r"(ret):"m"(*addr)); return ret; } -static inline void out_le16(volatile unsigned short *addr, int val) +static inline void out_le16(volatile uint16_t *addr, uint16_t val) { __asm__ __volatile__("sthbrx %1,0,%2; eieio":"=m"(*addr):"r"(val), "r"(addr)); } -static inline void out_be16(volatile unsigned short *addr, int val) +static inline void out_be16(volatile uint16_t *addr, uint16_t val) { __asm__ __volatile__("sth%U0%X0 %1,%0; eieio":"=m"(*addr):"r"(val)); } -static inline unsigned in_le32(volatile unsigned *addr) +static inline uint32_t in_le32(volatile uint32_t *addr) { - unsigned ret; + uint32_t ret; __asm__ __volatile__("lwbrx %0,0,%1; eieio":"=r"(ret): "r"(addr), "m"(*addr)); return ret; } -static inline unsigned in_be32(volatile unsigned *addr) +static inline uint32_t in_be32(volatile uint32_t *addr) { - unsigned ret; + uint32_t ret; __asm__ __volatile__("lwz%U1%X1 %0,%1; eieio":"=r"(ret):"m"(*addr)); return ret; } -static inline void out_le32(volatile unsigned *addr, int val) +static inline void out_le32(volatile uint32_t *addr, uint32_t val) { __asm__ __volatile__("stwbrx %1,0,%2; eieio":"=m"(*addr):"r"(val), "r"(addr)); } -static inline void out_be32(volatile unsigned *addr, int val) +static inline void out_be32(volatile unsigned *addr, uint32_t val) { __asm__ __volatile__("stw%U0%X0 %1,%0; eieio":"=m"(*addr):"r"(val)); } @@ -145,6 +129,56 @@ ns--; } } + + +/* + * The insw/outsw/insl/outsl functions don't do byte-swapping. + * They are only used in practice for transferring buffers which + * are arrays of bytes, and byte-swapping is not appropriate in + * that case. - paulus + */ + +static inline void insw(uint16_t port, void *buf, int ns) +{ + _insw((uint16_t *)(port + isa_io_base), buf, ns); +} + +static inline void outsw(uint16_t port, void *buf, int ns) +{ + _outsw((uint16_t *)(port + isa_io_base), buf, ns); +} + + +static inline uint8_t inb(uint16_t port) +{ + return in_8((uint8_t *)(port + isa_io_base)); +} + +static inline void outb(uint8_t val, uint16_t port) +{ + out_8((uint8_t *)(port + isa_io_base), val); +} + +static inline uint16_t inw(uint16_t port) +{ + return in_le16((uint16_t *)(port + isa_io_base)); +} + +static inline void outw(uint16_t val, uint16_t port) +{ + out_le16((uint16_t *)(port + isa_io_base), val); +} + +static inline uint32_t inl(uint16_t port) +{ + return in_le32((uint32_t *)(port + isa_io_base)); +} + +static inline void outl(uint32_t val, uint16_t port) +{ + out_le32((uint32_t *)(port + isa_io_base), val); +} + #else /* BOOTSTRAP */ #ifdef FCOMPILER #define inb(reg) ((u8)0xff)

1 0

[commit] r964 - in trunk/openbios-devel: arch/ppc/briq arch/ppc/mol arch/ppc/pearpc arch/ppc/qemu arch/unix include/arch/ppc
by repository service 21 Nov '10

21 Nov '10

Author: afaerber Date: Sun Nov 21 14:32:37 2010 New Revision: 964 URL: http://tracker.coreboot.org/trac/openbios/changeset/964 Log: ppc: Adjust isa_io_base for ppc64 To avoid cast warnings, use a 64-bit ISA I/O base on ppc64. v3: * Adjust unix target, pointed out by Blue. Unify ppc and sparc64, using unsigned long instead of uintptr_t. It is initialized from pci_arch_t, which uses unsigned long. * Update other ppc targets, pointed out by Blue. v2: Initial. Cc: Blue Swirl <blauwirbel(a)gmail.com> Cc: Alexander Graf <agraf(a)suse.de> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/arch/ppc/briq/init.c trunk/openbios-devel/arch/ppc/mol/init.c trunk/openbios-devel/arch/ppc/pearpc/init.c trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/unix/unix.c trunk/openbios-devel/include/arch/ppc/io.h Modified: trunk/openbios-devel/arch/ppc/briq/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/init.c Sun Nov 21 11:36:35 2010 (r963) +++ trunk/openbios-devel/arch/ppc/briq/init.c Sun Nov 21 14:32:37 2010 (r964) @@ -53,7 +53,7 @@ ; } -uint32_t isa_io_base; +unsigned long isa_io_base; void entry( void ) Modified: trunk/openbios-devel/arch/ppc/mol/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/init.c Sun Nov 21 11:36:35 2010 (r963) +++ trunk/openbios-devel/arch/ppc/mol/init.c Sun Nov 21 14:32:37 2010 (r964) @@ -49,7 +49,7 @@ ; } -uint32_t isa_io_base; +unsigned long isa_io_base; void entry( void ) Modified: trunk/openbios-devel/arch/ppc/pearpc/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/init.c Sun Nov 21 11:36:35 2010 (r963) +++ trunk/openbios-devel/arch/ppc/pearpc/init.c Sun Nov 21 14:32:37 2010 (r964) @@ -56,7 +56,7 @@ ; } -uint32_t isa_io_base; +unsigned long isa_io_base; void entry( void ) Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sun Nov 21 11:36:35 2010 (r963) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sun Nov 21 14:32:37 2010 (r964) @@ -152,7 +152,7 @@ .irqs = { 21, 22, 23, 24 } }, }; -uint32_t isa_io_base; +unsigned long isa_io_base; void entry( void ) Modified: trunk/openbios-devel/arch/unix/unix.c ============================================================================== --- trunk/openbios-devel/arch/unix/unix.c Sun Nov 21 11:36:35 2010 (r963) +++ trunk/openbios-devel/arch/unix/unix.c Sun Nov 21 14:32:37 2010 (r964) @@ -63,9 +63,7 @@ static int segfault = 0; static int verbose = 0; -#ifdef CONFIG_PPC -uint32_t isa_io_base; -#elif defined(CONFIG_SPARC64) +#if defined(CONFIG_PPC) || defined(CONFIG_SPARC64) unsigned long isa_io_base; #endif Modified: trunk/openbios-devel/include/arch/ppc/io.h ============================================================================== --- trunk/openbios-devel/include/arch/ppc/io.h Sun Nov 21 11:36:35 2010 (r963) +++ trunk/openbios-devel/include/arch/ppc/io.h Sun Nov 21 14:32:37 2010 (r964) @@ -14,7 +14,7 @@ #ifndef BOOTSTRAP -extern uint32_t isa_io_base; +extern unsigned long isa_io_base; /* * The insw/outsw/insl/outsl macros don't do byte-swapping.

1 0

[PATCH] ppc: Use mtmsrd on ppc64
by Andreas Färber 21 Nov '10

21 Nov '10

Cc: Alexander Graf <agraf(a)suse.de> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> --- arch/ppc/qemu/ofmem.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/arch/ppc/qemu/ofmem.c b/arch/ppc/qemu/ofmem.c index 9c60841..e8b0b24 100644 --- a/arch/ppc/qemu/ofmem.c +++ b/arch/ppc/qemu/ofmem.c @@ -25,6 +25,12 @@ #define BIT(n) (1U<<(31-(n))) +#ifdef __powerpc64__ +#define MTMSR "mtmsrd" +#else +#define MTMSR "mtmsr" +#endif + /* called from assembly */ extern void dsi_exception( void ); extern void isi_exception( void ); @@ -417,7 +423,7 @@ setup_mmu( unsigned long ramsize ) asm volatile("mfmsr %0" : "=r" (msr) : ); msr |= MSR_IR | MSR_DR; - asm volatile("mtmsr %0" :: "r" (msr) ); + asm volatile(MTMSR " %0" :: "r" (msr) ); } void -- 1.7.3

2 6

[commit] r963 - in trunk/openbios-devel: arch/ppc/qemu include/arch/ppc
by repository service 21 Nov '10

21 Nov '10

Author: afaerber Date: Sun Nov 21 11:36:35 2010 New Revision: 963 URL: http://tracker.coreboot.org/trac/openbios/changeset/963 Log: ppc: Use mtmsrd on ppc64 On ppc64 the mtmsr instruction only sets the low 32 bits of the MSR. mtmsrd must be used to set the high bits such as Sixty-Four Bit Mode as well. v2: * Introduce MTMSRD macro as seen on Linux, suggested by Alex. * Introduce inline functions {mfmsr,mtmsr} as suggested by Alex. Signed-off-by: Alexander Graf <agraf(a)suse.de> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c trunk/openbios-devel/include/arch/ppc/asmdefs.h trunk/openbios-devel/include/arch/ppc/processor.h Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sat Nov 20 22:14:59 2010 (r962) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sun Nov 21 11:36:35 2010 (r963) @@ -387,7 +387,7 @@ setup_mmu( unsigned long ramsize ) { ofmem_t *ofmem; - unsigned long sdr1, sr_base, msr; + unsigned long sdr1, sr_base; unsigned long hash_base; unsigned long hash_mask = 0xfff00000; /* alignment for ppc64 */ int i; @@ -415,9 +415,7 @@ /* Enable MMU */ - asm volatile("mfmsr %0" : "=r" (msr) : ); - msr |= MSR_IR | MSR_DR; - asm volatile("mtmsr %0" :: "r" (msr) ); + mtmsr(mfmsr() | MSR_IR | MSR_DR); } void Modified: trunk/openbios-devel/include/arch/ppc/asmdefs.h ============================================================================== --- trunk/openbios-devel/include/arch/ppc/asmdefs.h Sat Nov 20 22:14:59 2010 (r962) +++ trunk/openbios-devel/include/arch/ppc/asmdefs.h Sun Nov 21 11:36:35 2010 (r963) @@ -90,8 +90,10 @@ #ifdef __powerpc64__ #define RFI rfid +#define MTMSRD(r) mtmsrd r #else #define RFI rfi +#define MTMSRD(r) mtmsr r #endif #ifndef __darwin__ Modified: trunk/openbios-devel/include/arch/ppc/processor.h ============================================================================== --- trunk/openbios-devel/include/arch/ppc/processor.h Sat Nov 20 22:14:59 2010 (r962) +++ trunk/openbios-devel/include/arch/ppc/processor.h Sun Nov 21 11:36:35 2010 (r963) @@ -403,8 +403,28 @@ /* C helpers */ +#ifndef __ASSEMBLER__ + #define __stringify_1(x) #x #define __stringify(x) __stringify_1(x) #define mtspr(rn, v) asm volatile("mtspr " __stringify(rn) ",%0" : : "r" (v)) +static inline unsigned long mfmsr(void) +{ + unsigned long msr; + asm volatile("mfmsr %0" : "=r" (msr)); + return msr; +} + +static inline void mtmsr(unsigned long msr) +{ +#ifdef __powerpc64__ + asm volatile("mtmsrd %0" :: "r" (msr)); +#else + asm volatile("mtmsr %0" :: "r" (msr)); +#endif +} + +#endif /* !__ASSEMBLER__ */ + #endif /* _H_PROCESSOR */

1 0

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

20 Nov '10

Author: afaerber Date: Sat Nov 20 22:14:59 2010 New Revision: 962 URL: http://tracker.coreboot.org/trac/openbios/changeset/962 Log: ppc: Turn 32-bit ppc64 into a config option, to be deprecated Having legacy 64-bit support as an option allows users to disable it and test the 32-bit only version prior to official removal of legacy 64-bit support. Fork single-bitness macros EXCEPTION_{PREAMBLE,EPILOGUE}: Use assembler macros for things that are constant to avoid ; and \, and use preprocessor macros to handle differences. Adopt QEMU coding style for new code. Functional changes for ppc64: * Don't clear MSR in preamble in order to stay in Sixty-Four Bit Mode. * Just save the minimum number of registers since 64-bit code will save the full registers. * Reserve 48 bytes of stack frame space for ppc64, according to 64-bit PowerPC ELF ABI supplement 1.9. * Use rfid via RFI macro. v2: * Remove inaccurate comment on unused stack location. * Add explanatory comments for #else and #endif. Cc: Alexander Graf <agraf(a)suse.de> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/ppc/qemu/start.S trunk/openbios-devel/config/examples/ppc_config.xml Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Wed Nov 17 20:36:18 2010 (r961) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sat Nov 20 22:14:59 2010 (r962) @@ -303,6 +303,7 @@ fword("finish-device"); } +#ifdef CONFIG_PPC_64BITSUPPORT /* In order to get 64 bit aware handlers that rescue all our GPRs from getting truncated to 32 bits, we need to patch the existing handlers so they jump to our 64 bit aware ones. */ @@ -322,6 +323,7 @@ asm ( "icbi 0, %0" : : "r"(dsi) ); asm ( "icbi 0, %0" : : "r"(isi) ); } +#endif static void cpu_970_init(const struct cpudef *cpu) @@ -341,10 +343,12 @@ fword("finish-device"); +#ifdef CONFIG_PPC_64BITSUPPORT /* The 970 is a PPC64 CPU, so we need to activate * 64bit aware interrupt handlers */ ppc64_patch_handlers(); +#endif /* The 970 also implements the HIOR which we need to set to 0 */ Modified: trunk/openbios-devel/arch/ppc/qemu/start.S ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/start.S Wed Nov 17 20:36:18 2010 (r961) +++ trunk/openbios-devel/arch/ppc/qemu/start.S Sat Nov 20 22:14:59 2010 (r962) @@ -14,6 +14,7 @@ * */ +#include "autoconf.h" #include "asm/asmdefs.h" #include "asm/processor.h" @@ -24,6 +25,8 @@ #define ILLEGAL_VECTOR( v ) .org __vectors + v ; vector__##v: bl trap_error ; #define VECTOR( v, dummystr ) .org __vectors + v ; vector__##v +#ifdef CONFIG_PPC_64BITSUPPORT + /* We're trying to use the same code for the ppc32 and ppc64 handlers here. * On ppc32 we only save/restore the registers, C considers volatile. * @@ -176,6 +179,87 @@ #undef stl #undef ll +#else /* !CONFIG_PPC_64BITSUPPORT */ + +#ifdef __powerpc64__ + +#define ULONG_SIZE 8 +#define STACKFRAME_MINSIZE 48 +#define stl std +#define ll ld + +#else + +#define ULONG_SIZE 4 +#define STACKFRAME_MINSIZE 16 +#define stl stw +#define ll lwz + +#endif + +.macro EXCEPTION_PREAMBLE + mtsprg1 r1 /* scratch */ + mfsprg0 r1 /* exception stack in sprg0 */ + addi r1, r1, -(20 * ULONG_SIZE) /* push exception frame */ + + stl r0, ( 0 * ULONG_SIZE)(r1) /* save r0 */ + mfsprg1 r0 + stl r0, ( 1 * ULONG_SIZE)(r1) /* save r1 */ + stl r2, ( 2 * ULONG_SIZE)(r1) /* save r2 */ + stl r3, ( 3 * ULONG_SIZE)(r1) /* save r3 */ + stl r4, ( 4 * ULONG_SIZE)(r1) + stl r5, ( 5 * ULONG_SIZE)(r1) + stl r6, ( 6 * ULONG_SIZE)(r1) + stl r7, ( 7 * ULONG_SIZE)(r1) + stl r8, ( 8 * ULONG_SIZE)(r1) + stl r9, ( 9 * ULONG_SIZE)(r1) + stl r10, (10 * ULONG_SIZE)(r1) + stl r11, (11 * ULONG_SIZE)(r1) + stl r12, (12 * ULONG_SIZE)(r1) + + mflr r0 + stl r0, (13 * ULONG_SIZE)(r1) + mfcr r0 + stl r0, (14 * ULONG_SIZE)(r1) + mfctr r0 + stl r0, (15 * ULONG_SIZE)(r1) + mfxer r0 + stl r0, (16 * ULONG_SIZE)(r1) + + addi r1, r1, -STACKFRAME_MINSIZE /* C ABI saves LR and SP */ +.endm + +.macro EXCEPTION_EPILOGUE + addi r1, r1, STACKFRAME_MINSIZE /* pop ABI frame */ + + ll r0, (13 * ULONG_SIZE)(r1) + mtlr r0 + ll r0, (14 * ULONG_SIZE)(r1) + mtcr r0 + ll r0, (15 * ULONG_SIZE)(r1) + mtctr r0 + ll r0, (16 * ULONG_SIZE)(r1) + mtxer r0 + + ll r0, ( 0 * ULONG_SIZE)(r1) + ll r2, ( 2 * ULONG_SIZE)(r1) + ll r3, ( 3 * ULONG_SIZE)(r1) + ll r4, ( 4 * ULONG_SIZE)(r1) + ll r5, ( 5 * ULONG_SIZE)(r1) + ll r6, ( 6 * ULONG_SIZE)(r1) + ll r7, ( 7 * ULONG_SIZE)(r1) + ll r8, ( 8 * ULONG_SIZE)(r1) + ll r9, ( 9 * ULONG_SIZE)(r1) + ll r10, (10 * ULONG_SIZE)(r1) + ll r11, (11 * ULONG_SIZE)(r1) + ll r12, (12 * ULONG_SIZE)(r1) + + ll r1, ( 1 * ULONG_SIZE)(r1) /* restore stack at last */ + RFI +.endm + +#endif /* !CONFIG_PPC_64BITSUPPORT */ + /************************************************************************/ /* vectors */ /************************************************************************/ @@ -253,6 +337,8 @@ ILLEGAL_VECTOR( 0x1600 ) ILLEGAL_VECTOR( 0x1700 ) +#ifdef CONFIG_PPC_64BITSUPPORT + VECTOR( 0x2000, "DSI_64" ): EXCEPTION_PREAMBLE_64 LOAD_REG_IMMEDIATE(r3, dsi_exception) @@ -267,6 +353,8 @@ bctrl EXCEPTION_EPILOGUE_64 +#endif + GLOBL(__vectors_end): /************************************************************************/ @@ -275,7 +363,7 @@ GLOBL(_entry): -#ifndef __powerpc64__ +#ifdef CONFIG_PPC_64BITSUPPORT /* clear MSR, disable MMU */ li r0,0 Modified: trunk/openbios-devel/config/examples/ppc_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/ppc_config.xml Wed Nov 17 20:36:18 2010 (r961) +++ trunk/openbios-devel/config/examples/ppc_config.xml Sat Nov 20 22:14:59 2010 (r962) @@ -57,6 +57,7 @@ <option name="CONFIG_DEBUG_FS" type="boolean" value="false"/>  + <option name="CONFIG_PPC_64BITSUPPORT" type="boolean" value="true"/> <option name="CONFIG_LINUXBIOS" type="boolean" value="false"/> <option name="CONFIG_RTAS" type="boolean" value="false"/>

2 1

[commit] r961 - in trunk/openbios-devel: . config/xml
by repository service 17 Nov '10

17 Nov '10

Author: blueswirl Date: Wed Nov 17 20:36:18 2010 New Revision: 961 URL: http://tracker.coreboot.org/trac/openbios/changeset/961 Log: Introduce automatic build dependencies Use GCC to generate dependency files. Tested-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/Makefile.target trunk/openbios-devel/config/xml/rules.xml Modified: trunk/openbios-devel/Makefile.target ============================================================================== --- trunk/openbios-devel/Makefile.target Wed Nov 17 20:36:16 2010 (r960) +++ trunk/openbios-devel/Makefile.target Wed Nov 17 20:36:18 2010 (r961) @@ -14,6 +14,8 @@ HOSTCFLAGS+= -Wstrict-prototypes -Wmissing-declarations -Wundef -Wendif-labels HOSTCFLAGS+= -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -Wnested-externs HOSTCFLAGS+= -W +# Flags for dependency generation +HOSTCFLAGS+= -MMD -MP -MT $@ -MF '$(*D)/$(*F).d' HOSTINCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include CC := $(TARGET)gcc @@ -29,6 +31,8 @@ CFLAGS+= -Wstrict-prototypes -Wmissing-declarations -Wundef -Wendif-labels CFLAGS+= -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -Wnested-externs CFLAGS+= -Werror +# Flags for dependency generation +CFLAGS+= -MMD -MP -MT $@ -MF '$(*D)/$(*F).d' INCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include AS_FLAGS+= -g @@ -63,7 +67,7 @@ @printf "Cleaning up for $(ARCH)..." @rm -rf forth.dict.core forthstrap *.dict openbios-* @rm -f $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs - @find . -type f $ -name "*~" -o -name '*.o' -o -name '*.a' $ -exec rm \{\} \; + @find . -type f $ -name "*~" -o -name '*.o' -o -name '*.d' -o -name '*.a' $ -exec rm \{\} \; @echo " ok" build-verbose: info build @@ -71,3 +75,6 @@ build: all include rules.mak + +# Include automatically generated dependency files +-include $(wildcard $(ODIR)/host/kernel/*.d $(ODIR)/target/*/*.d $(ODIR)/target/*/*/*.d $(ODIR)/target/*/*/*/*.d) Modified: trunk/openbios-devel/config/xml/rules.xml ============================================================================== --- trunk/openbios-devel/config/xml/rules.xml Wed Nov 17 20:36:16 2010 (r960) +++ trunk/openbios-devel/config/xml/rules.xml Wed Nov 17 20:36:18 2010 (r961) @@ -4,11 +4,11 @@ $(call quiet-command,$(HOSTCC) $(HOSTCFLAGS) -o $@ $^," HOSTCC $(TARGET_DIR)$@") </rule> <rule target="host" entity="object"> - $(call quiet-command,$(HOSTCC) $(HOSTCFLAGS) $(HOSTINCLUDES) -c -o $@ $^," HOSTCC $(TARGET_DIR)$@") + $(call quiet-command,$(HOSTCC) $(HOSTCFLAGS) $(HOSTINCLUDES) -c -o $@ $<," HOSTCC $(TARGET_DIR)$@") </rule> <rule target="host" entity="object" extracflags="1"> $(call quiet-command,$(HOSTCC) $(HOSTCFLAGS) $(HOSTINCLUDES)</rule> -<rule target="host" entity="object" extracflags="2"> -c -o $@ $^," HOSTCC $(TARGET_DIR)$@") +<rule target="host" entity="object" extracflags="2"> -c -o $@ $<," HOSTCC $(TARGET_DIR)$@") </rule> <rule target="host" entity="library"> $(call quiet--command,$(AR) cru $@ $^; $(RANLIB) $@," HOSTAR $(TARGET_DIR)$@") @@ -19,11 +19,11 @@ $(call quiet-command,$(CC) $(CFLAGS) -o $@ $^," CC $(TARGET_DIR)$@") </rule> <rule target="target" entity="object"> - $(call quiet-command,$(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $^," CC $(TARGET_DIR)$@") + $(call quiet-command,$(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $<," CC $(TARGET_DIR)$@") </rule> <rule target="target" entity="object" extracflags="1"> $(call quiet-command,$(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES)</rule> -<rule target="target" entity="object" extracflags="2"> -c -o $@ $^," CC $(TARGET_DIR)$@") +<rule target="target" entity="object" extracflags="2"> -c -o $@ $<," CC $(TARGET_DIR)$@") </rule> <rule target="target" entity="library"> $(call quiet-command,$(AR) cru $@ $^; $(RANLIB) $@," AR $(TARGET_DIR)$@")

1 0

[commit] r960 - trunk/openbios-devel/kernel
by repository service 17 Nov '10

17 Nov '10

Author: blueswirl Date: Wed Nov 17 20:36:16 2010 New Revision: 960 URL: http://tracker.coreboot.org/trac/openbios/changeset/960 Log: kernel: avoid including C files from another Merge kernel/internal.c and kernel/primitives.c into kernel/forth.c. This helps with the build dependencies. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Deleted: trunk/openbios-devel/kernel/internal.c trunk/openbios-devel/kernel/primitives.c Modified: trunk/openbios-devel/kernel/build.xml trunk/openbios-devel/kernel/forth.c Modified: trunk/openbios-devel/kernel/build.xml ============================================================================== --- trunk/openbios-devel/kernel/build.xml Mon Nov 15 23:13:13 2010 (r959) +++ trunk/openbios-devel/kernel/build.xml Wed Nov 17 20:36:16 2010 (r960) @@ -1,15 +1,15 @@ <build> <executable name="forthstrap" target="host"> - <object source="bootstrap.c"/> <object source="dict.c"/> - <object source="primitives.c"/> + <object source="bootstrap.c"/> + <object source="forth.c"/> <object source="stack.c"/> </executable> <library name="bootstrap" type="static" target="target"> <object source="dict.c"/> - <object source="primitives.c"/> + <object source="forth.c"/> <object source="stack.c"/> </library> Modified: trunk/openbios-devel/kernel/forth.c ============================================================================== --- trunk/openbios-devel/kernel/forth.c Mon Nov 15 23:13:13 2010 (r959) +++ trunk/openbios-devel/kernel/forth.c Wed Nov 17 20:36:16 2010 (r960) @@ -1,4 +1,5 @@ -/* tag: C implementation of all forth primitives +/* tag: C implementation of all forth primitives, + * internal words, inner interpreter and such * * Copyright (C) 2003 Patrick Mauritz, Stefan Reinauer * @@ -6,6 +7,833 @@ * the copyright and warranty status of this work. */ +#include "config.h" +#include "sysinclude.h" +#include "kernel/stack.h" +#include "kernel/kernel.h" +#include "dict.h" + +/* + * cross platform abstraction + */ + +#include "cross.h" + +#ifndef FCOMPILER +#include "libc/vsprintf.h" +#else +#include <stdarg.h> +#endif + +/* + * execution works as follows: + * - PC is pushed on return stack + * - PC is set to new CFA + * - address pointed by CFA is executed by CPU + */ + +typedef void forth_word(void); + +static forth_word * const words[]; +ucell PC; +volatile int interruptforth = 0; + +#define DEBUG_MODE_NONE 0 +#define DEBUG_MODE_STEP 1 +#define DEBUG_MODE_TRACE 2 +#define DEBUG_MODE_STEPUP 3 + +#define DEBUG_BANNER "\nStepper keys: <space>/<enter> Up Down Trace Rstack Forth\n" + +/* Empty linked list of debug xts */ +struct debug_xt { + ucell xt_docol; + ucell xt_semis; + int mode; + struct debug_xt *next; +}; + +static struct debug_xt debug_xt_eol = { (ucell)0, (ucell)0, 0, NULL}; +static struct debug_xt *debug_xt_list = &debug_xt_eol; + +/* Static buffer for xt name */ +char xtname[MAXNFALEN]; + +#ifndef FCOMPILER +/* instead of pointing to an explicit 0 variable we + * point behind the pointer. + */ +static ucell t[] = { 0, 0, 0, 0 }; +static ucell *trampoline = t; + +/* + * Code Field Address (CFA) definitions (DOCOL and the like) + */ + +void forth_init(void) +{ + init_trampoline(trampoline); +} +#endif + +#ifndef CONFIG_DEBUG_INTERPRETER +#define dbg_interp_printk( a... ) do { } while(0) +#else +#define dbg_interp_printk( a... ) printk( a ) +#endif + +#ifndef CONFIG_DEBUG_INTERNAL +#define dbg_internal_printk( a... ) do { } while(0) +#else +#define dbg_internal_printk( a... ) printk( a ) +#endif + + +void init_trampoline(ucell *tramp) +{ + tramp[0] = DOCOL; + tramp[1] = 0; + tramp[2] = target_ucell(pointer2cell(tramp) + 3 * sizeof(ucell)); + tramp[3] = 0; +} + +static inline void processxt(ucell xt) +{ + void (*tokenp) (void); + + dbg_interp_printk("processxt: pc=%x, xt=%x\n", PC, xt); + tokenp = words[xt]; + tokenp(); +} + +static void docol(void) +{ /* DOCOL */ + PUSHR(PC); + PC = read_ucell(cell2pointer(PC)); + + dbg_interp_printk("docol: %s\n", cell2pointer( lfa2nfa(PC - sizeof(cell)) )); +} + +static void semis(void) +{ + PC = POPR(); +} + +static inline void next(void) +{ + PC += sizeof(ucell); + + dbg_interp_printk("next: PC is now %x\n", PC); + processxt(read_ucell(cell2pointer(read_ucell(cell2pointer(PC))))); +} + +static inline void next_dbg(void); + +int enterforth(xt_t xt) +{ + ucell *_cfa = (ucell*)cell2pointer(xt); + cell tmp; + + if (read_ucell(_cfa) != DOCOL) { + trampoline[1] = target_ucell(xt); + _cfa = trampoline; + } + + if (rstackcnt < 0) { + rstackcnt = 0; + } + + tmp = rstackcnt; + interruptforth = FORTH_INTSTAT_CLR; + + PUSHR(PC); + PC = pointer2cell(_cfa); + + while (rstackcnt > tmp && !(interruptforth & FORTH_INTSTAT_STOP)) { + if (debug_xt_list->next == NULL) { + while (rstackcnt > tmp && !interruptforth) { + dbg_interp_printk("enterforth: NEXT\n"); + next(); + } + } else { + while (rstackcnt > tmp && !interruptforth) { + dbg_interp_printk("enterforth: NEXT_DBG\n"); + next_dbg(); + } + } + + /* Always clear the debug mode change flag */ + interruptforth = interruptforth & (~FORTH_INTSTAT_DBG); + } + +#if 0 + /* return true if we took an exception. The caller should normally + * handle exceptions by returning immediately since the throw + * is supposed to abort the execution of this C-code too. + */ + + if (rstackcnt != tmp) { + printk("EXCEPTION DETECTED!\n"); + } +#endif + return rstackcnt != tmp; +} + +/* called inline thus a slightly different behaviour */ +static void lit(void) +{ /* LIT */ + PC += sizeof(cell); + PUSH(read_ucell(cell2pointer(PC))); + dbg_interp_printk("lit: %x\n", read_ucell(cell2pointer(PC))); +} + +static void docon(void) +{ /* DOCON */ + ucell tmp = read_ucell(cell2pointer(read_ucell(cell2pointer(PC)) + sizeof(ucell))); + PUSH(tmp); + dbg_interp_printk("docon: PC=%x, value=%x\n", PC, tmp); +} + +static void dovar(void) +{ /* DOVAR */ + ucell tmp = read_ucell(cell2pointer(PC)) + sizeof(ucell); + PUSH(tmp); /* returns address to variable */ + dbg_interp_printk("dovar: PC: %x, %x\n", PC, tmp); +} + +static void dobranch(void) +{ /* unconditional branch */ + PC += sizeof(cell); + PC += read_cell(cell2pointer(PC)); +} + +static void docbranch(void) +{ /* conditional branch */ + PC += sizeof(cell); + if (POP()) { + dbg_internal_printk(" ?branch: end loop\n"); + } else { + dbg_internal_printk(" ?branch: follow branch\n"); + PC += read_cell(cell2pointer(PC)); + } +} + + +static void execute(void) +{ /* EXECUTE */ + ucell address = POP(); + dbg_interp_printk("execute: %x\n", address); + + PUSHR(PC); + trampoline[1] = target_ucell(address); + PC = pointer2cell(trampoline); +} + +/* + * call ( ... function-ptr -- ??? ) + */ +static void call(void) +{ +#ifdef FCOMPILER + printk("Sorry. Usage of Forth2C binding is forbidden during bootstrap.\n"); + exit(1); +#else + void (*funcptr) (void); + funcptr=(void *)cell2pointer(POP()); + dbg_interp_printk("call: %x", funcptr); + funcptr(); +#endif +} + +/* + * sys-debug ( errno -- ) + */ + +static void sysdebug(void) +{ +#ifdef FCOMPILER + cell errorno=POP(); + exception(errorno); +#else + (void) POP(); +#endif +} + +static void dodoes(void) +{ /* DODOES */ + ucell data = read_ucell(cell2pointer(PC)) + (2 * sizeof(ucell)); + ucell word = read_ucell(cell2pointer(read_ucell(cell2pointer(PC)) + sizeof(ucell))); + + dbg_interp_printk("DODOES data=%x word=%x\n", data, word); + + PUSH(data); + PUSH(word); + + execute(); +} + +static void dodefer(void) +{ + docol(); +} + +static void dodo(void) +{ + cell startval, endval; + startval = POP(); + endval = POP(); + + PUSHR(endval); + PUSHR(startval); +} + +static void doisdo(void) +{ + cell startval, endval, offset; + + startval = POP(); + endval = POP(); + + PC += sizeof(cell); + + if (startval == endval) { + offset = read_cell(cell2pointer(PC)); + PC += offset; + } else { + PUSHR(endval); + PUSHR(startval); + } +} + +static void doloop(void) +{ + cell offset, startval, endval; + + startval = POPR() + 1; + endval = POPR(); + + PC += sizeof(cell); + + if (startval < endval) { + offset = read_cell(cell2pointer(PC)); + PC += offset; + PUSHR(endval); + PUSHR(startval); + } + +} + +static void doplusloop(void) +{ + ucell high, low; + cell increment, startval, endval, offset; + + increment = POP(); + + startval = POPR(); + endval = POPR(); + + low = (ucell) startval; + startval += increment; + + PC += sizeof(cell); + + if (increment >= 0) { + high = (ucell) startval; + } else { + high = low; + low = (ucell) startval; + } + + if (endval - (low + 1) >= high - low) { + offset = read_cell(cell2pointer(PC)); + PC += offset; + + PUSHR(endval); + PUSHR(startval); + } +} + +/* + * instance handling CFAs + */ +#ifndef FCOMPILER +static ucell get_myself(void) +{ + static ucell *myselfptr = NULL; + if (myselfptr == NULL) { + myselfptr = (ucell*)cell2pointer(findword("my-self")) + 1; + } + ucell *myself = (ucell*)cell2pointer(*myselfptr); + return (myself != NULL) ? *myself : 0; +} + +static void doivar(void) +{ + ucell r, *p = (ucell *)(*(ucell *) cell2pointer(PC) + sizeof(ucell)); + ucell ibase = get_myself(); + + dbg_interp_printk("ivar, offset: %d size: %d (ibase %d)\n", p[0], p[1], ibase ); + + r = ibase ? ibase + p[0] : pointer2cell(&p[2]); + PUSH( r ); +} + +static void doival(void) +{ + ucell r, *p = (ucell *)(*(ucell *) cell2pointer(PC) + sizeof(ucell)); + ucell ibase = get_myself(); + + dbg_interp_printk("ivar, offset: %d size: %d\n", p[0], p[1] ); + + r = ibase ? ibase + p[0] : pointer2cell(&p[2]); + PUSH( *(ucell *)cell2pointer(r) ); +} + +static void doidefer(void) +{ + ucell *p = (ucell *)(*(ucell *) cell2pointer(PC) + sizeof(ucell)); + ucell ibase = get_myself(); + + dbg_interp_printk("doidefer, offset: %d size: %d\n", p[0], p[1] ); + + PUSHR(PC); + PC = ibase ? ibase + p[0] : pointer2cell(&p[2]); + PC -= sizeof(ucell); +} +#else +static void noinstances(void) +{ + printk("Opening devices is not supported during bootstrap. Sorry.\n"); + exit(1); +} +#define doivar noinstances +#define doival noinstances +#define doidefer noinstances +#endif + +/* + * $include / $encode-file + */ +#ifdef FCOMPILER +static void +string_relay(void (*func)(const char *)) +{ + int len = POP(); + char *name, *p = (char*)cell2pointer(POP()); + name = malloc(len + 1); + memcpy(name, p, len); + name[len] = 0; + (*func)(name); + free(name); +} +#else +#define string_relay(dummy) do { DROP(); DROP(); } while(0) +#endif + +static void +do_include(void) +{ + string_relay(&include_file); +} + +static void +do_encode_file( void ) +{ + string_relay(&encode_file); +} + +/* + * Debug support functions + */ + +static +int printf_console(const char *fmt, ...) +{ + cell tmp; + + char buf[512]; + va_list args; + int i; + + va_start(args, fmt); + i = vsnprintf(buf, sizeof(buf), fmt, args); + va_end(args); + + /* Push to the Forth interpreter for console output */ + tmp = rstackcnt; + + PUSH(pointer2cell(buf)); + PUSH((int)strlen(buf)); + trampoline[1] = findword("type"); + + PUSHR(PC); + PC = pointer2cell(trampoline); + + while (rstackcnt > tmp) { + dbg_interp_printk("printf_console: NEXT\n"); + next(); + } + + return i; +} + +static +int getchar_console(void) +{ + cell tmp; + + /* Push to the Forth interpreter for console output */ + tmp = rstackcnt; + + trampoline[1] = findword("key"); + + PUSHR(PC); + PC = pointer2cell(trampoline); + + while (rstackcnt > tmp) { + dbg_interp_printk("getchar_console: NEXT\n"); + next(); + } + + return POP(); +} + +static void +display_dbg_dstack(void) +{ + /* Display dstack contents between parentheses */ + int i; + + if (dstackcnt == 0) { + printf_console(" ( Empty ) "); + return; + } else { + printf_console(" ( "); + for (i = 1; i <= dstackcnt; i++) { + if (i != 1) { + printf_console(" "); + } + printf_console("%" FMT_CELL_x, dstack[i]); + } + printf_console(" ) "); + } +} + +static void +display_dbg_rstack(void) +{ + /* Display rstack contents between parentheses */ + int i; + + if (rstackcnt == 0) { + printf_console(" ( Empty ) "); + return; + } else { + printf_console("\nR: ( "); + for (i = 1; i <= rstackcnt; i++) { + if (i != 1) { + printf_console(" "); + } + printf_console("%" FMT_CELL_x, rstack[i]); + } + printf_console(" ) \n"); + } +} + +static int +add_debug_xt(ucell xt) +{ + struct debug_xt *debug_xt_item; + + /* If the xt CFA isn't DOCOL then issue a warning and do nothing */ + if (read_ucell(cell2pointer(xt)) != DOCOL) { + printf_console("\nprimitive words cannot be debugged\n"); + return 0; + } + + /* If this xt is already in the list, do nothing but indicate success */ + for (debug_xt_item = debug_xt_list; debug_xt_item->next != NULL; + debug_xt_item = debug_xt_item->next) + if (debug_xt_item->xt_docol == xt) { + return 1; + } + + /* We already have the CFA (PC) indicating the starting cell of + the word, however we also need the ending cell too (we cannot + rely on the rstack as it can be arbitrarily changed by a forth + word). Hence the use of findsemis() */ + + /* Otherwise add to the head of the linked list */ + debug_xt_item = malloc(sizeof(struct debug_xt)); + debug_xt_item->xt_docol = xt; + debug_xt_item->xt_semis = findsemis(xt); + debug_xt_item->mode = DEBUG_MODE_NONE; + debug_xt_item->next = debug_xt_list; + debug_xt_list = debug_xt_item; + + /* Indicate debug mode change */ + interruptforth |= FORTH_INTSTAT_DBG; + + /* Success */ + return 1; +} + +static void +del_debug_xt(ucell xt) +{ + struct debug_xt *debug_xt_item, *tmp_xt_item; + + /* Handle the case where the xt is at the head of the list */ + if (debug_xt_list->xt_docol == xt) { + tmp_xt_item = debug_xt_list; + debug_xt_list = debug_xt_list->next; + free(tmp_xt_item); + + return; + } + + /* Otherwise find this xt in the linked list and remove it */ + for (debug_xt_item = debug_xt_list; debug_xt_item->next != NULL; + debug_xt_item = debug_xt_item->next) { + if (debug_xt_item->next->xt_docol == xt) { + tmp_xt_item = debug_xt_item->next; + debug_xt_item->next = debug_xt_item->next->next; + free(tmp_xt_item); + } + } + + /* If the list is now empty, indicate debug mode change */ + if (debug_xt_list->next == NULL) { + interruptforth |= FORTH_INTSTAT_DBG; + } +} + +static void +do_source_dbg(struct debug_xt *debug_xt_item) +{ + /* Forth source debugger implementation */ + char k, done = 0; + + /* Display current dstack */ + display_dbg_dstack(); + printf_console("\n"); + + fstrncpy(xtname, lfa2nfa(read_ucell(cell2pointer(PC)) - sizeof(cell)), MAXNFALEN); + printf_console("%p: %s ", cell2pointer(PC), xtname); + + /* If in trace mode, we just carry on */ + if (debug_xt_item->mode == DEBUG_MODE_TRACE) { + return; + } + + /* Otherwise in step mode, prompt for a keypress */ + k = getchar_console(); + + /* Only proceed if done is true */ + while (!done) { + switch (k) { + + case ' ': + case '\n': + /* Perform a single step */ + done = 1; + break; + + case 'u': + case 'U': + /* Up - unmark current word for debug, mark its caller for + * debugging and finish executing current word */ + + /* Since this word could alter the rstack during its execution, + * we only know the caller when (semis) is called for this xt. + * Hence we mark the xt as a special DEBUG_MODE_STEPUP which + * means we run as normal, but schedule the xt for deletion + * at its corresponding (semis) word when we know the rstack + * will be set to its final parent value */ + debug_xt_item->mode = DEBUG_MODE_STEPUP; + done = 1; + break; + + case 'd': + case 'D': + /* Down - mark current word for debug and step into it */ + done = add_debug_xt(read_ucell(cell2pointer(PC))); + if (!done) { + k = getchar_console(); + } + break; + + case 't': + case 'T': + /* Trace mode */ + debug_xt_item->mode = DEBUG_MODE_TRACE; + done = 1; + break; + + case 'r': + case 'R': + /* Display rstack */ + display_dbg_rstack(); + done = 0; + k = getchar_console(); + break; + + case 'f': + case 'F': + /* Start subordinate Forth interpreter */ + PUSHR(PC - sizeof(cell)); + PC = findword("outer-interpreter") + sizeof(ucell); + + /* Save rstack position for when we return */ + dbgrstackcnt = rstackcnt; + done = 1; + break; + + default: + /* Display debug banner */ + printf_console(DEBUG_BANNER); + k = getchar_console(); + } + } +} + +static void docol_dbg(void) +{ /* DOCOL */ + struct debug_xt *debug_xt_item; + + PUSHR(PC); + PC = read_ucell(cell2pointer(PC)); + + /* If current xt is in our debug xt list, display word name */ + debug_xt_item = debug_xt_list; + while (debug_xt_item->next) { + if (debug_xt_item->xt_docol == PC) { + fstrncpy(xtname, lfa2nfa(PC - sizeof(cell)), MAXNFALEN); + printf_console("\n: %s ", xtname); + + /* Step mode is the default */ + debug_xt_item->mode = DEBUG_MODE_STEP; + } + + debug_xt_item = debug_xt_item->next; + } + + dbg_interp_printk("docol_dbg: %s\n", cell2pointer(lfa2nfa(PC - sizeof(cell)))); +} + +static void semis_dbg(void) +{ + struct debug_xt *debug_xt_item, *debug_xt_up = NULL; + + /* If current semis is in our debug xt list, disable debug mode */ + debug_xt_item = debug_xt_list; + while (debug_xt_item->next) { + if (debug_xt_item->xt_semis == PC) { + if (debug_xt_item->mode != DEBUG_MODE_STEPUP) { + /* Handle the normal case */ + fstrncpy(xtname, lfa2nfa(debug_xt_item->xt_docol - sizeof(cell)), MAXNFALEN); + printf_console("\n[ Finished %s ] ", xtname); + + /* Reset to step mode in case we were in trace mode */ + debug_xt_item->mode = DEBUG_MODE_STEP; + } else { + /* This word requires execution of the debugger "Up" + * semantics. However we can't do this here since we + * are iterating through the debug list, and we need + * to change it. So we do it afterwards. + */ + debug_xt_up = debug_xt_item; + } + } + + debug_xt_item = debug_xt_item->next; + } + + /* Execute debugger "Up" semantics if required */ + if (debug_xt_up) { + /* Only add the parent word if it is not within the trampoline */ + if (rstack[rstackcnt] != (cell)pointer2cell(&trampoline[1])) { + del_debug_xt(debug_xt_up->xt_docol); + add_debug_xt(findxtfromcell(rstack[rstackcnt])); + + fstrncpy(xtname, lfa2nfa(findxtfromcell(rstack[rstackcnt]) - sizeof(cell)), MAXNFALEN); + printf_console("\n[ Up to %s ] ", xtname); + } else { + fstrncpy(xtname, lfa2nfa(findxtfromcell(debug_xt_up->xt_docol) - sizeof(cell)), MAXNFALEN); + printf_console("\n[ Finished %s (Unable to go up, hit trampoline) ] ", xtname); + + del_debug_xt(debug_xt_up->xt_docol); + } + + debug_xt_up = NULL; + } + + PC = POPR(); +} + +static inline void next_dbg(void) +{ + struct debug_xt *debug_xt_item; + void (*tokenp) (void); + + PC += sizeof(ucell); + + /* If the PC lies within a debug range, run the source debugger */ + debug_xt_item = debug_xt_list; + while (debug_xt_item->next) { + if (PC >= debug_xt_item->xt_docol && PC <= debug_xt_item->xt_semis && + debug_xt_item->mode != DEBUG_MODE_STEPUP) { + do_source_dbg(debug_xt_item); + } + + debug_xt_item = debug_xt_item->next; + } + + dbg_interp_printk("next_dbg: PC is now %x\n", PC); + + /* Intercept DOCOL and SEMIS and redirect to debug versions */ + if (read_ucell(cell2pointer(read_ucell(cell2pointer(PC)))) == DOCOL) { + tokenp = docol_dbg; + tokenp(); + } else if (read_ucell(cell2pointer(read_ucell(cell2pointer(PC)))) == DOSEMIS) { + tokenp = semis_dbg; + tokenp(); + } else { + /* Otherwise process as normal */ + processxt(read_ucell(cell2pointer(read_ucell(cell2pointer(PC))))); + } +} + +static void +do_debug_xt(void) +{ + ucell xt = POP(); + + /* Add to the debug list */ + if (add_debug_xt(xt)) { + /* Display debug banner */ + printf_console(DEBUG_BANNER); + + /* Indicate change to debug mode */ + interruptforth |= FORTH_INTSTAT_DBG; + } +} + +static void +do_debug_off(void) +{ + /* Empty the debug xt linked list */ + while (debug_xt_list->next != NULL) { + del_debug_xt(debug_xt_list->xt_docol); + } +} + +/* + * Forth primitives needed to set up + * all the words described in IEEE1275-1994. + */ + /* * dup ( x -- x x ) */ @@ -1019,3 +1847,120 @@ { PUSH(rstack[rstackcnt - 2]); } + +/* words[] is a function array of all native code functions used by + * the dictionary, i.e. CFAs and primitives. + * Any change here needs a matching change in the primitive word's + * name list that is kept for bootstrapping in kernel/bootstrap.c + * + * NOTE: THIS LIST SHALL NOT CHANGE (EXCEPT MANDATORY ADDITIONS AT + * THE END). ANY OTHER CHANGE WILL BREAK COMPATIBILITY TO OLDER + * BINARY DICTIONARIES. + */ +static forth_word * const words[] = { + /* + * CFAs and special words + */ + semis, + docol, + lit, + docon, + dovar, + dodefer, + dodoes, + dodo, + doisdo, + doloop, + doplusloop, + doival, + doivar, + doidefer, + + /* + * primitives + */ + fdup, /* dup */ + twodup, /* 2dup */ + isdup, /* ?dup */ + over, /* over */ + twoover, /* 2over */ + pick, /* pick */ + drop, /* drop */ + twodrop, /* 2drop */ + nip, /* nip */ + roll, /* roll */ + rot, /* rot */ + minusrot, /* -rot */ + swap, /* swap */ + twoswap, /* 2swap */ + tor, /* >r */ + rto, /* r> */ + rfetch, /* r@ */ + depth, /* depth */ + depthwrite, /* depth! */ + rdepth, /* rdepth */ + rdepthwrite, /* rdepth! */ + plus, /* + */ + minus, /* - */ + mult, /* * */ + umult, /* u* */ + mudivmod, /* mu/mod */ + forthabs, /* abs */ + negate, /* negate */ + max, /* max */ + min, /* min */ + lshift, /* lshift */ + rshift, /* rshift */ + rshifta, /* >>a */ + and, /* and */ + or, /* or */ + xor, /* xor */ + invert, /* invert */ + dplus, /* d+ */ + dminus, /* d- */ + mmult, /* m* */ + ummult, /* um* */ + fetch, /* @ */ + cfetch, /* c@ */ + wfetch, /* w@ */ + lfetch, /* l@ */ + store, /* ! */ + plusstore, /* +! */ + cstore, /* c! */ + wstore, /* w! */ + lstore, /* l! */ + equals, /* = */ + greater, /* > */ + less, /* < */ + ugreater, /* u> */ + uless, /* u< */ + spfetch, /* sp@ */ + fmove, /* move */ + ffill, /* fill */ + emit, /* emit */ + iskey, /* key? */ + key, /* key */ + execute, /* execute */ + here, /* here */ + herewrite, /* here! */ + dobranch, /* dobranch */ + docbranch, /* do?branch */ + unalignedwordread, /* unaligned-w@ */ + unalignedwordwrite, /* unaligned-w! */ + unalignedlongread, /* unaligned-l@ */ + unalignedlongwrite, /* unaligned-l! */ + iocfetch, /* ioc@ */ + iowfetch, /* iow@ */ + iolfetch, /* iol@ */ + iocstore, /* ioc! */ + iowstore, /* iow! */ + iolstore, /* iol! */ + loop_i, /* i */ + loop_j, /* j */ + call, /* call */ + sysdebug, /* sys-debug */ + do_include, /* $include */ + do_encode_file, /* $encode-file */ + do_debug_xt, /* (debug */ + do_debug_off, /* (debug-off) */ +};

1 0

[commit] r959 - trunk/openbios-devel/forth/admin
by repository service 15 Nov '10

15 Nov '10

Author: afaerber Date: Mon Nov 15 23:13:13 2010 New Revision: 959 URL: http://tracker.coreboot.org/trac/openbios/changeset/959 Log: Pretty-print MMU available property v4: * Pass 1 as #acells and #scells, following IEEE 1275 sect. 3.6.5. On ppc the cpu nodes would've had #size-cells as 0. v3: * Evaluate /chosen mmu property rather than device_type "cpu". Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/forth/admin/devices.fs Modified: trunk/openbios-devel/forth/admin/devices.fs ============================================================================== --- trunk/openbios-devel/forth/admin/devices.fs Mon Nov 15 23:10:20 2010 (r958) +++ trunk/openbios-devel/forth/admin/devices.fs Mon Nov 15 23:13:13 2010 (r959) @@ -339,6 +339,16 @@ 2drop exit then then + " /chosen" find-dev if + " mmu" rot get-package-property 0= if + decode-int nip nip ihandle>phandle active-package = if + 2over " available" strcmp 0= if + 1 1 2swap .p-reg + 2drop exit + then + then + then + then 2swap 2drop ( data len ) (.property)

1 0

[commit] r958 - trunk/openbios-devel/forth/admin
by repository service 15 Nov '10

15 Nov '10

Author: afaerber Date: Mon Nov 15 23:10:20 2010 New Revision: 958 URL: http://tracker.coreboot.org/trac/openbios/changeset/958 Log: Pretty-print /memory available property v4: * Pass #address-cells and #size-cells as arguments. v3: * Simplify condition. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/forth/admin/devices.fs Modified: trunk/openbios-devel/forth/admin/devices.fs ============================================================================== --- trunk/openbios-devel/forth/admin/devices.fs Mon Nov 15 23:04:03 2010 (r957) +++ trunk/openbios-devel/forth/admin/devices.fs Mon Nov 15 23:10:20 2010 (r958) @@ -333,6 +333,13 @@ 2drop exit then + active-package get-nodename " memory" strcmp 0= if + 2over " available" strcmp 0= if + my-#acells my-#scells 2swap .p-reg + 2drop exit + then + then + 2swap 2drop ( data len ) (.property) ;

1 0

[commit] r957 - in trunk/openbios-devel/forth: admin device
by repository service 15 Nov '10

15 Nov '10

Author: afaerber Date: Mon Nov 15 23:04:03 2010 New Revision: 957 URL: http://tracker.coreboot.org/trac/openbios/changeset/957 Log: Pretty-print reg property Executing .properties for, e.g., the /memory node would print the "reg" property as a series of bytes. Visualize the "reg" format as a table, with address and size columns. v6: * Drop lower limit for my-#scells, since #size-cells is unsigned. Pointed out by Segher. * Drop comment outdated by v5. v5: * Drop the upper limit for my-#scells, suggested by Segher. * Fix indentation. v4: * Fix my-#scells to allow 0 return value. * Pass #address-cells and #size-cells as arguments. * Add some more comments. v3: * Optimization, based on code suggested by Segher. v2: * Use my-#acells for address size. * Introduce my-#scells for size size. Cc: Segher Boessenkool <segher(a)kernel.crashing.org> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/forth/admin/devices.fs trunk/openbios-devel/forth/device/property.fs Modified: trunk/openbios-devel/forth/admin/devices.fs ============================================================================== --- trunk/openbios-devel/forth/admin/devices.fs Mon Nov 15 22:58:39 2010 (r956) +++ trunk/openbios-devel/forth/admin/devices.fs Mon Nov 15 23:04:03 2010 (r957) @@ -304,8 +304,35 @@ 2drop ." <unimplemented type>" ; +\ Print the value of a property in "reg" format +: .p-reg ( #acells #scells data len -- ) + 2dup + -rot ( #acells #scells data+len data len ) + >r >r -rot ( data+len #acells #scells R: len data ) + 4 * swap 4 * dup r> r> ( data+len #sbytes #abytes #abytes data len ) + bounds ( data+len #sbytes #abytes #abytes data+len data ) ?do + dup 0= if 2 spaces then \ start of "size" part + 2dup <> if \ non-first byte in row + dup 3 and 0= if space then \ make numbers more readable + then + i c@ 2 0.r \ print byte + 1- 3dup nip + 0= if \ end of row + 3 pick i 1+ > if \ non-last byte + cr \ start new line + d# 26 spaces \ indentation + then + drop dup \ update counter + then + loop + 3drop drop +; + \ This function hardwires data formats to particular node properties : (.property-by-name) ( name-str name-len data len -- ) + 2over " reg" strcmp 0= if + my-#acells my-#scells 2swap .p-reg + 2drop exit + then + 2swap 2drop ( data len ) (.property) ; Modified: trunk/openbios-devel/forth/device/property.fs ============================================================================== --- trunk/openbios-devel/forth/device/property.fs Mon Nov 15 22:58:39 2010 (r956) +++ trunk/openbios-devel/forth/device/property.fs Mon Nov 15 23:04:03 2010 (r957) @@ -157,6 +157,18 @@ then ; +\ HELPER: get #size-cells value (from parent) +: my-#scells ( -- #size-cells ) + my-self ?dup if >in.device-node @ else active-package then + ?dup if >dn.parent @ then + ?dup if + " #size-cells" rot get-package-property if 1 exit then + decode-int nip nip + else + 1 + then +; + : decode-string ( prop-addr1 prop-len1 -- prop-addr2 prop-len2 str len ) dup 0> if 2dup bounds \ check property for 0 bytes

1 0

[commit] r956 - trunk/openbios-devel/forth/admin
by repository service 15 Nov '10

15 Nov '10

Author: afaerber Date: Mon Nov 15 22:58:39 2010 New Revision: 956 URL: http://tracker.coreboot.org/trac/openbios/changeset/956 Log: Allow name-based property display v3: * Preserve (.property) as heuristic function. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/forth/admin/devices.fs Modified: trunk/openbios-devel/forth/admin/devices.fs ============================================================================== --- trunk/openbios-devel/forth/admin/devices.fs Sat Nov 13 21:28:20 2010 (r955) +++ trunk/openbios-devel/forth/admin/devices.fs Mon Nov 15 22:58:39 2010 (r956) @@ -304,6 +304,12 @@ 2drop ." <unimplemented type>" ; +\ This function hardwires data formats to particular node properties +: (.property-by-name) ( name-str name-len data len -- ) + 2swap 2drop ( data len ) + (.property) +; + : .properties ( -- ) ?active-package dup >r if 0 0 @@ -312,7 +318,10 @@ while cr 2dup dup -rot type begin ." " 1+ dup d# 26 >= until drop - 2dup active-package get-package-property drop (.property) + 2dup + 2dup active-package get-package-property drop + ( name-str name-len data len ) + (.property-by-name) repeat then r> drop

1 0

Re: [OpenBIOS] [PATCH] Introduce forth_init() for trampoline initialization
by Andreas Färber 15 Nov '10

15 Nov '10

Am 09.11.2010 um 19:07 schrieb Blue Swirl: > On Mon, Nov 8, 2010 at 11:20 PM, Andreas Färber <andreas.faerber(a)web.de > > wrote: >> Move trampoline variable initialization to init_trampoline(), >> like in kernel/bootstrap.c. >> >> Add calls to a new forth_init() function for each architecture >> to invoke it. Idea courtesy of Blue. > > Looks OK. I tried a slightly different approach (attached). I added > Mark's excellent analysis as a comment. General setup_trampoline() idea is fine with me. Please avoid indentation changes though, you're replacing single tabs with 8 spaces. Are you sure it doesn't need to be initialized from anywhere else, like load_dictionary() or forth_init(), for the initialization to take effect before any of these? > However, ppc64 does not build for me: > GEN bootstrap.dict > panic: segmentation violation at 0xccbd062c > dict=0x2aecccbd0010 here=0x2aecccbd0638(dict+0x628) pc=0x0(dict > +0x3342fff0) > dstackcnt=0 rstackcnt=0 instruction=deadbeef > dstack: 0x0 > rstack: 0x0 > Writing dictionary core file > <trampoline.diff> Will check. You are aware that there is no dependency rule for internal.c since it is #included from primitives.c? You either need to do `make clean` first or reconfigure for changes to take effect. Andreas

3 12

[PATCH 2/2] Introduce automatic build dependencies
by Blue Swirl 13 Nov '10

13 Nov '10

Use GCC to generate dependency files. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> --- Makefile.target | 9 ++++++++- config/xml/rules.xml | 8 ++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Makefile.target b/Makefile.target index fd46e09..9ae8120 100644 --- a/Makefile.target +++ b/Makefile.target @@ -14,6 +14,8 @@ HOSTCFLAGS+= -Wall -Wredundant-decls -Wshadow -Wpointer-arith HOSTCFLAGS+= -Wstrict-prototypes -Wmissing-declarations -Wundef -Wendif-labels HOSTCFLAGS+= -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -Wnested-externs HOSTCFLAGS+= -W +# Flags for dependency generation +HOSTCFLAGS+= -MMD -MP -MT $@ -MF '$(*D)/$(*F).d' HOSTINCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include CC := $(TARGET)gcc @@ -29,6 +31,8 @@ CFLAGS+= -Wall -Wredundant-decls -Wshadow -Wpointer-arith CFLAGS+= -Wstrict-prototypes -Wmissing-declarations -Wundef -Wendif-labels CFLAGS+= -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -Wnested-externs CFLAGS+= -Werror +# Flags for dependency generation +CFLAGS+= -MMD -MP -MT $@ -MF '$(*D)/$(*F).d' INCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include AS_FLAGS+= -g @@ -63,7 +67,7 @@ clean: @printf "Cleaning up for $(ARCH)..." @rm -rf forth.dict.core forthstrap *.dict openbios-* @rm -f $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs - @find . -type f $ -name "*~" -o -name '*.o' -o -name '*.a' $ -exec rm \{\} \; + @find . -type f $ -name "*~" -o -name '*.o' -o -name '*.d' -o -name '*.a' $ -exec rm \{\} \; @echo " ok" build-verbose: info build @@ -71,3 +75,6 @@ build-verbose: info build build: all include rules.mak + +# Include automatically generated dependency files +-include $(wildcard $(ODIR)/host/kernel/*.d $(ODIR)/target/*/*.d $(ODIR)/target/*/*/*.d $(ODIR)/target/*/*/*/*.d) diff --git a/config/xml/rules.xml b/config/xml/rules.xml index 9764298..86a3b6b 100644 --- a/config/xml/rules.xml +++ b/config/xml/rules.xml @@ -4,11 +4,11 @@ $(call quiet-command,$(HOSTCC) $(HOSTCFLAGS) -o $@ $^," HOSTCC $(TARGET_DIR)$@") </rule> <rule target="host" entity="object"> - $(call quiet-command,$(HOSTCC) $(HOSTCFLAGS) $(HOSTINCLUDES) -c -o $@ $^," HOSTCC $(TARGET_DIR)$@") + $(call quiet-command,$(HOSTCC) $(HOSTCFLAGS) $(HOSTINCLUDES) -c -o $@ $<," HOSTCC $(TARGET_DIR)$@") </rule> <rule target="host" entity="object" extracflags="1"> $(call quiet-command,$(HOSTCC) $(HOSTCFLAGS) $(HOSTINCLUDES)</rule> -<rule target="host" entity="object" extracflags="2"> -c -o $@ $^," HOSTCC $(TARGET_DIR)$@") +<rule target="host" entity="object" extracflags="2"> -c -o $@ $<," HOSTCC $(TARGET_DIR)$@") </rule> <rule target="host" entity="library"> $(call quiet--command,$(AR) cru $@ $^; $(RANLIB) $@," HOSTAR $(TARGET_DIR)$@") @@ -19,11 +19,11 @@ $(call quiet-command,$(CC) $(CFLAGS) -o $@ $^," CC $(TARGET_DIR)$@") </rule> <rule target="target" entity="object"> - $(call quiet-command,$(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $^," CC $(TARGET_DIR)$@") + $(call quiet-command,$(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $<," CC $(TARGET_DIR)$@") </rule> <rule target="target" entity="object" extracflags="1"> $(call quiet-command,$(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES)</rule> -<rule target="target" entity="object" extracflags="2"> -c -o $@ $^," CC $(TARGET_DIR)$@") +<rule target="target" entity="object" extracflags="2"> -c -o $@ $<," CC $(TARGET_DIR)$@") </rule> <rule target="target" entity="library"> $(call quiet-command,$(AR) cru $@ $^; $(RANLIB) $@," AR $(TARGET_DIR)$@") -- 1.6.2.4

2 2

[PATCH 1/2] kernel: avoid including C files from another
by Blue Swirl 13 Nov '10

13 Nov '10

Merge kernel/internal.c and kernel/primitives.c into kernel/forth.c. This helps with the build dependencies. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> --- kernel/build.xml | 6 +- kernel/forth.c | 947 ++++++++++++++++++++++++++++++++++++++++++++++++++- kernel/internal.c | 806 ------------------------------------------- kernel/primitives.c | 148 -------- 4 files changed, 949 insertions(+), 958 deletions(-) delete mode 100644 kernel/internal.c delete mode 100644 kernel/primitives.c diff --git a/kernel/build.xml b/kernel/build.xml index 5541356..1090cd6 100644 --- a/kernel/build.xml +++ b/kernel/build.xml @@ -1,15 +1,15 @@ <build> <executable name="forthstrap" target="host"> - <object source="bootstrap.c"/> <object source="dict.c"/> - <object source="primitives.c"/> + <object source="bootstrap.c"/> + <object source="forth.c"/> <object source="stack.c"/> </executable> <library name="bootstrap" type="static" target="target"> <object source="dict.c"/> - <object source="primitives.c"/> + <object source="forth.c"/> <object source="stack.c"/> </library> diff --git a/kernel/forth.c b/kernel/forth.c index 2876709..0d3b2d2 100644 --- a/kernel/forth.c +++ b/kernel/forth.c @@ -1,4 +1,5 @@ -/* tag: C implementation of all forth primitives +/* tag: C implementation of all forth primitives, + * internal words, inner interpreter and such * * Copyright (C) 2003 Patrick Mauritz, Stefan Reinauer * @@ -6,6 +7,833 @@ * the copyright and warranty status of this work. */ +#include "config.h" +#include "sysinclude.h" +#include "kernel/stack.h" +#include "kernel/kernel.h" +#include "dict.h" + +/* + * cross platform abstraction + */ + +#include "cross.h" + +#ifndef FCOMPILER +#include "libc/vsprintf.h" +#else +#include <stdarg.h> +#endif + +/* + * execution works as follows: + * - PC is pushed on return stack + * - PC is set to new CFA + * - address pointed by CFA is executed by CPU + */ + +typedef void forth_word(void); + +static forth_word * const words[]; +ucell PC; +volatile int interruptforth = 0; + +#define DEBUG_MODE_NONE 0 +#define DEBUG_MODE_STEP 1 +#define DEBUG_MODE_TRACE 2 +#define DEBUG_MODE_STEPUP 3 + +#define DEBUG_BANNER "\nStepper keys: <space>/<enter> Up Down Trace Rstack Forth\n" + +/* Empty linked list of debug xts */ +struct debug_xt { + ucell xt_docol; + ucell xt_semis; + int mode; + struct debug_xt *next; +}; + +static struct debug_xt debug_xt_eol = { (ucell)0, (ucell)0, 0, NULL}; +static struct debug_xt *debug_xt_list = &debug_xt_eol; + +/* Static buffer for xt name */ +char xtname[MAXNFALEN]; + +#ifndef FCOMPILER +/* instead of pointing to an explicit 0 variable we + * point behind the pointer. + */ +static ucell t[] = { 0, 0, 0, 0 }; +static ucell *trampoline = t; + +/* + * Code Field Address (CFA) definitions (DOCOL and the like) + */ + +void forth_init(void) +{ + init_trampoline(trampoline); +} +#endif + +#ifndef CONFIG_DEBUG_INTERPRETER +#define dbg_interp_printk( a... ) do { } while(0) +#else +#define dbg_interp_printk( a... ) printk( a ) +#endif + +#ifndef CONFIG_DEBUG_INTERNAL +#define dbg_internal_printk( a... ) do { } while(0) +#else +#define dbg_internal_printk( a... ) printk( a ) +#endif + + +void init_trampoline(ucell *tramp) +{ + tramp[0] = DOCOL; + tramp[1] = 0; + tramp[2] = target_ucell(pointer2cell(tramp) + 3 * sizeof(ucell)); + tramp[3] = 0; +} + +static inline void processxt(ucell xt) +{ + void (*tokenp) (void); + + dbg_interp_printk("processxt: pc=%x, xt=%x\n", PC, xt); + tokenp = words[xt]; + tokenp(); +} + +static void docol(void) +{ /* DOCOL */ + PUSHR(PC); + PC = read_ucell(cell2pointer(PC)); + + dbg_interp_printk("docol: %s\n", cell2pointer( lfa2nfa(PC - sizeof(cell)) )); +} + +static void semis(void) +{ + PC = POPR(); +} + +static inline void next(void) +{ + PC += sizeof(ucell); + + dbg_interp_printk("next: PC is now %x\n", PC); + processxt(read_ucell(cell2pointer(read_ucell(cell2pointer(PC))))); +} + +static inline void next_dbg(void); + +int enterforth(xt_t xt) +{ + ucell *_cfa = (ucell*)cell2pointer(xt); + cell tmp; + + if (read_ucell(_cfa) != DOCOL) { + trampoline[1] = target_ucell(xt); + _cfa = trampoline; + } + + if (rstackcnt < 0) { + rstackcnt = 0; + } + + tmp = rstackcnt; + interruptforth = FORTH_INTSTAT_CLR; + + PUSHR(PC); + PC = pointer2cell(_cfa); + + while (rstackcnt > tmp && !(interruptforth & FORTH_INTSTAT_STOP)) { + if (debug_xt_list->next == NULL) { + while (rstackcnt > tmp && !interruptforth) { + dbg_interp_printk("enterforth: NEXT\n"); + next(); + } + } else { + while (rstackcnt > tmp && !interruptforth) { + dbg_interp_printk("enterforth: NEXT_DBG\n"); + next_dbg(); + } + } + + /* Always clear the debug mode change flag */ + interruptforth = interruptforth & (~FORTH_INTSTAT_DBG); + } + +#if 0 + /* return true if we took an exception. The caller should normally + * handle exceptions by returning immediately since the throw + * is supposed to abort the execution of this C-code too. + */ + + if (rstackcnt != tmp) { + printk("EXCEPTION DETECTED!\n"); + } +#endif + return rstackcnt != tmp; +} + +/* called inline thus a slightly different behaviour */ +static void lit(void) +{ /* LIT */ + PC += sizeof(cell); + PUSH(read_ucell(cell2pointer(PC))); + dbg_interp_printk("lit: %x\n", read_ucell(cell2pointer(PC))); +} + +static void docon(void) +{ /* DOCON */ + ucell tmp = read_ucell(cell2pointer(read_ucell(cell2pointer(PC)) + sizeof(ucell))); + PUSH(tmp); + dbg_interp_printk("docon: PC=%x, value=%x\n", PC, tmp); +} + +static void dovar(void) +{ /* DOVAR */ + ucell tmp = read_ucell(cell2pointer(PC)) + sizeof(ucell); + PUSH(tmp); /* returns address to variable */ + dbg_interp_printk("dovar: PC: %x, %x\n", PC, tmp); +} + +static void dobranch(void) +{ /* unconditional branch */ + PC += sizeof(cell); + PC += read_cell(cell2pointer(PC)); +} + +static void docbranch(void) +{ /* conditional branch */ + PC += sizeof(cell); + if (POP()) { + dbg_internal_printk(" ?branch: end loop\n"); + } else { + dbg_internal_printk(" ?branch: follow branch\n"); + PC += read_cell(cell2pointer(PC)); + } +} + + +static void execute(void) +{ /* EXECUTE */ + ucell address = POP(); + dbg_interp_printk("execute: %x\n", address); + + PUSHR(PC); + trampoline[1] = target_ucell(address); + PC = pointer2cell(trampoline); +} + +/* + * call ( ... function-ptr -- ??? ) + */ +static void call(void) +{ +#ifdef FCOMPILER + printk("Sorry. Usage of Forth2C binding is forbidden during bootstrap.\n"); + exit(1); +#else + void (*funcptr) (void); + funcptr=(void *)cell2pointer(POP()); + dbg_interp_printk("call: %x", funcptr); + funcptr(); +#endif +} + +/* + * sys-debug ( errno -- ) + */ + +static void sysdebug(void) +{ +#ifdef FCOMPILER + cell errorno=POP(); + exception(errorno); +#else + (void) POP(); +#endif +} + +static void dodoes(void) +{ /* DODOES */ + ucell data = read_ucell(cell2pointer(PC)) + (2 * sizeof(ucell)); + ucell word = read_ucell(cell2pointer(read_ucell(cell2pointer(PC)) + sizeof(ucell))); + + dbg_interp_printk("DODOES data=%x word=%x\n", data, word); + + PUSH(data); + PUSH(word); + + execute(); +} + +static void dodefer(void) +{ + docol(); +} + +static void dodo(void) +{ + cell startval, endval; + startval = POP(); + endval = POP(); + + PUSHR(endval); + PUSHR(startval); +} + +static void doisdo(void) +{ + cell startval, endval, offset; + + startval = POP(); + endval = POP(); + + PC += sizeof(cell); + + if (startval == endval) { + offset = read_cell(cell2pointer(PC)); + PC += offset; + } else { + PUSHR(endval); + PUSHR(startval); + } +} + +static void doloop(void) +{ + cell offset, startval, endval; + + startval = POPR() + 1; + endval = POPR(); + + PC += sizeof(cell); + + if (startval < endval) { + offset = read_cell(cell2pointer(PC)); + PC += offset; + PUSHR(endval); + PUSHR(startval); + } + +} + +static void doplusloop(void) +{ + ucell high, low; + cell increment, startval, endval, offset; + + increment = POP(); + + startval = POPR(); + endval = POPR(); + + low = (ucell) startval; + startval += increment; + + PC += sizeof(cell); + + if (increment >= 0) { + high = (ucell) startval; + } else { + high = low; + low = (ucell) startval; + } + + if (endval - (low + 1) >= high - low) { + offset = read_cell(cell2pointer(PC)); + PC += offset; + + PUSHR(endval); + PUSHR(startval); + } +} + +/* + * instance handling CFAs + */ +#ifndef FCOMPILER +static ucell get_myself(void) +{ + static ucell *myselfptr = NULL; + if (myselfptr == NULL) { + myselfptr = (ucell*)cell2pointer(findword("my-self")) + 1; + } + ucell *myself = (ucell*)cell2pointer(*myselfptr); + return (myself != NULL) ? *myself : 0; +} + +static void doivar(void) +{ + ucell r, *p = (ucell *)(*(ucell *) cell2pointer(PC) + sizeof(ucell)); + ucell ibase = get_myself(); + + dbg_interp_printk("ivar, offset: %d size: %d (ibase %d)\n", p[0], p[1], ibase ); + + r = ibase ? ibase + p[0] : pointer2cell(&p[2]); + PUSH( r ); +} + +static void doival(void) +{ + ucell r, *p = (ucell *)(*(ucell *) cell2pointer(PC) + sizeof(ucell)); + ucell ibase = get_myself(); + + dbg_interp_printk("ivar, offset: %d size: %d\n", p[0], p[1] ); + + r = ibase ? ibase + p[0] : pointer2cell(&p[2]); + PUSH( *(ucell *)cell2pointer(r) ); +} + +static void doidefer(void) +{ + ucell *p = (ucell *)(*(ucell *) cell2pointer(PC) + sizeof(ucell)); + ucell ibase = get_myself(); + + dbg_interp_printk("doidefer, offset: %d size: %d\n", p[0], p[1] ); + + PUSHR(PC); + PC = ibase ? ibase + p[0] : pointer2cell(&p[2]); + PC -= sizeof(ucell); +} +#else +static void noinstances(void) +{ + printk("Opening devices is not supported during bootstrap. Sorry.\n"); + exit(1); +} +#define doivar noinstances +#define doival noinstances +#define doidefer noinstances +#endif + +/* + * $include / $encode-file + */ +#ifdef FCOMPILER +static void +string_relay(void (*func)(const char *)) +{ + int len = POP(); + char *name, *p = (char*)cell2pointer(POP()); + name = malloc(len + 1); + memcpy(name, p, len); + name[len] = 0; + (*func)(name); + free(name); +} +#else +#define string_relay(dummy) do { DROP(); DROP(); } while(0) +#endif + +static void +do_include(void) +{ + string_relay(&include_file); +} + +static void +do_encode_file( void ) +{ + string_relay(&encode_file); +} + +/* + * Debug support functions + */ + +static +int printf_console(const char *fmt, ...) +{ + cell tmp; + + char buf[512]; + va_list args; + int i; + + va_start(args, fmt); + i = vsnprintf(buf, sizeof(buf), fmt, args); + va_end(args); + + /* Push to the Forth interpreter for console output */ + tmp = rstackcnt; + + PUSH(pointer2cell(buf)); + PUSH((int)strlen(buf)); + trampoline[1] = findword("type"); + + PUSHR(PC); + PC = pointer2cell(trampoline); + + while (rstackcnt > tmp) { + dbg_interp_printk("printf_console: NEXT\n"); + next(); + } + + return i; +} + +static +int getchar_console(void) +{ + cell tmp; + + /* Push to the Forth interpreter for console output */ + tmp = rstackcnt; + + trampoline[1] = findword("key"); + + PUSHR(PC); + PC = pointer2cell(trampoline); + + while (rstackcnt > tmp) { + dbg_interp_printk("getchar_console: NEXT\n"); + next(); + } + + return POP(); +} + +static void +display_dbg_dstack(void) +{ + /* Display dstack contents between parentheses */ + int i; + + if (dstackcnt == 0) { + printf_console(" ( Empty ) "); + return; + } else { + printf_console(" ( "); + for (i = 1; i <= dstackcnt; i++) { + if (i != 1) { + printf_console(" "); + } + printf_console("%" FMT_CELL_x, dstack[i]); + } + printf_console(" ) "); + } +} + +static void +display_dbg_rstack(void) +{ + /* Display rstack contents between parentheses */ + int i; + + if (rstackcnt == 0) { + printf_console(" ( Empty ) "); + return; + } else { + printf_console("\nR: ( "); + for (i = 1; i <= rstackcnt; i++) { + if (i != 1) { + printf_console(" "); + } + printf_console("%" FMT_CELL_x, rstack[i]); + } + printf_console(" ) \n"); + } +} + +static int +add_debug_xt(ucell xt) +{ + struct debug_xt *debug_xt_item; + + /* If the xt CFA isn't DOCOL then issue a warning and do nothing */ + if (read_ucell(cell2pointer(xt)) != DOCOL) { + printf_console("\nprimitive words cannot be debugged\n"); + return 0; + } + + /* If this xt is already in the list, do nothing but indicate success */ + for (debug_xt_item = debug_xt_list; debug_xt_item->next != NULL; + debug_xt_item = debug_xt_item->next) + if (debug_xt_item->xt_docol == xt) { + return 1; + } + + /* We already have the CFA (PC) indicating the starting cell of + the word, however we also need the ending cell too (we cannot + rely on the rstack as it can be arbitrarily changed by a forth + word). Hence the use of findsemis() */ + + /* Otherwise add to the head of the linked list */ + debug_xt_item = malloc(sizeof(struct debug_xt)); + debug_xt_item->xt_docol = xt; + debug_xt_item->xt_semis = findsemis(xt); + debug_xt_item->mode = DEBUG_MODE_NONE; + debug_xt_item->next = debug_xt_list; + debug_xt_list = debug_xt_item; + + /* Indicate debug mode change */ + interruptforth |= FORTH_INTSTAT_DBG; + + /* Success */ + return 1; +} + +static void +del_debug_xt(ucell xt) +{ + struct debug_xt *debug_xt_item, *tmp_xt_item; + + /* Handle the case where the xt is at the head of the list */ + if (debug_xt_list->xt_docol == xt) { + tmp_xt_item = debug_xt_list; + debug_xt_list = debug_xt_list->next; + free(tmp_xt_item); + + return; + } + + /* Otherwise find this xt in the linked list and remove it */ + for (debug_xt_item = debug_xt_list; debug_xt_item->next != NULL; + debug_xt_item = debug_xt_item->next) { + if (debug_xt_item->next->xt_docol == xt) { + tmp_xt_item = debug_xt_item->next; + debug_xt_item->next = debug_xt_item->next->next; + free(tmp_xt_item); + } + } + + /* If the list is now empty, indicate debug mode change */ + if (debug_xt_list->next == NULL) { + interruptforth |= FORTH_INTSTAT_DBG; + } +} + +static void +do_source_dbg(struct debug_xt *debug_xt_item) +{ + /* Forth source debugger implementation */ + char k, done = 0; + + /* Display current dstack */ + display_dbg_dstack(); + printf_console("\n"); + + fstrncpy(xtname, lfa2nfa(read_ucell(cell2pointer(PC)) - sizeof(cell)), MAXNFALEN); + printf_console("%p: %s ", cell2pointer(PC), xtname); + + /* If in trace mode, we just carry on */ + if (debug_xt_item->mode == DEBUG_MODE_TRACE) { + return; + } + + /* Otherwise in step mode, prompt for a keypress */ + k = getchar_console(); + + /* Only proceed if done is true */ + while (!done) { + switch (k) { + + case ' ': + case '\n': + /* Perform a single step */ + done = 1; + break; + + case 'u': + case 'U': + /* Up - unmark current word for debug, mark its caller for + * debugging and finish executing current word */ + + /* Since this word could alter the rstack during its execution, + * we only know the caller when (semis) is called for this xt. + * Hence we mark the xt as a special DEBUG_MODE_STEPUP which + * means we run as normal, but schedule the xt for deletion + * at its corresponding (semis) word when we know the rstack + * will be set to its final parent value */ + debug_xt_item->mode = DEBUG_MODE_STEPUP; + done = 1; + break; + + case 'd': + case 'D': + /* Down - mark current word for debug and step into it */ + done = add_debug_xt(read_ucell(cell2pointer(PC))); + if (!done) { + k = getchar_console(); + } + break; + + case 't': + case 'T': + /* Trace mode */ + debug_xt_item->mode = DEBUG_MODE_TRACE; + done = 1; + break; + + case 'r': + case 'R': + /* Display rstack */ + display_dbg_rstack(); + done = 0; + k = getchar_console(); + break; + + case 'f': + case 'F': + /* Start subordinate Forth interpreter */ + PUSHR(PC - sizeof(cell)); + PC = findword("outer-interpreter") + sizeof(ucell); + + /* Save rstack position for when we return */ + dbgrstackcnt = rstackcnt; + done = 1; + break; + + default: + /* Display debug banner */ + printf_console(DEBUG_BANNER); + k = getchar_console(); + } + } +} + +static void docol_dbg(void) +{ /* DOCOL */ + struct debug_xt *debug_xt_item; + + PUSHR(PC); + PC = read_ucell(cell2pointer(PC)); + + /* If current xt is in our debug xt list, display word name */ + debug_xt_item = debug_xt_list; + while (debug_xt_item->next) { + if (debug_xt_item->xt_docol == PC) { + fstrncpy(xtname, lfa2nfa(PC - sizeof(cell)), MAXNFALEN); + printf_console("\n: %s ", xtname); + + /* Step mode is the default */ + debug_xt_item->mode = DEBUG_MODE_STEP; + } + + debug_xt_item = debug_xt_item->next; + } + + dbg_interp_printk("docol_dbg: %s\n", cell2pointer(lfa2nfa(PC - sizeof(cell)))); +} + +static void semis_dbg(void) +{ + struct debug_xt *debug_xt_item, *debug_xt_up = NULL; + + /* If current semis is in our debug xt list, disable debug mode */ + debug_xt_item = debug_xt_list; + while (debug_xt_item->next) { + if (debug_xt_item->xt_semis == PC) { + if (debug_xt_item->mode != DEBUG_MODE_STEPUP) { + /* Handle the normal case */ + fstrncpy(xtname, lfa2nfa(debug_xt_item->xt_docol - sizeof(cell)), MAXNFALEN); + printf_console("\n[ Finished %s ] ", xtname); + + /* Reset to step mode in case we were in trace mode */ + debug_xt_item->mode = DEBUG_MODE_STEP; + } else { + /* This word requires execution of the debugger "Up" + * semantics. However we can't do this here since we + * are iterating through the debug list, and we need + * to change it. So we do it afterwards. + */ + debug_xt_up = debug_xt_item; + } + } + + debug_xt_item = debug_xt_item->next; + } + + /* Execute debugger "Up" semantics if required */ + if (debug_xt_up) { + /* Only add the parent word if it is not within the trampoline */ + if (rstack[rstackcnt] != (cell)pointer2cell(&trampoline[1])) { + del_debug_xt(debug_xt_up->xt_docol); + add_debug_xt(findxtfromcell(rstack[rstackcnt])); + + fstrncpy(xtname, lfa2nfa(findxtfromcell(rstack[rstackcnt]) - sizeof(cell)), MAXNFALEN); + printf_console("\n[ Up to %s ] ", xtname); + } else { + fstrncpy(xtname, lfa2nfa(findxtfromcell(debug_xt_up->xt_docol) - sizeof(cell)), MAXNFALEN); + printf_console("\n[ Finished %s (Unable to go up, hit trampoline) ] ", xtname); + + del_debug_xt(debug_xt_up->xt_docol); + } + + debug_xt_up = NULL; + } + + PC = POPR(); +} + +static inline void next_dbg(void) +{ + struct debug_xt *debug_xt_item; + void (*tokenp) (void); + + PC += sizeof(ucell); + + /* If the PC lies within a debug range, run the source debugger */ + debug_xt_item = debug_xt_list; + while (debug_xt_item->next) { + if (PC >= debug_xt_item->xt_docol && PC <= debug_xt_item->xt_semis && + debug_xt_item->mode != DEBUG_MODE_STEPUP) { + do_source_dbg(debug_xt_item); + } + + debug_xt_item = debug_xt_item->next; + } + + dbg_interp_printk("next_dbg: PC is now %x\n", PC); + + /* Intercept DOCOL and SEMIS and redirect to debug versions */ + if (read_ucell(cell2pointer(read_ucell(cell2pointer(PC)))) == DOCOL) { + tokenp = docol_dbg; + tokenp(); + } else if (read_ucell(cell2pointer(read_ucell(cell2pointer(PC)))) == DOSEMIS) { + tokenp = semis_dbg; + tokenp(); + } else { + /* Otherwise process as normal */ + processxt(read_ucell(cell2pointer(read_ucell(cell2pointer(PC))))); + } +} + +static void +do_debug_xt(void) +{ + ucell xt = POP(); + + /* Add to the debug list */ + if (add_debug_xt(xt)) { + /* Display debug banner */ + printf_console(DEBUG_BANNER); + + /* Indicate change to debug mode */ + interruptforth |= FORTH_INTSTAT_DBG; + } +} + +static void +do_debug_off(void) +{ + /* Empty the debug xt linked list */ + while (debug_xt_list->next != NULL) { + del_debug_xt(debug_xt_list->xt_docol); + } +} + +/* + * Forth primitives needed to set up + * all the words described in IEEE1275-1994. + */ + /* * dup ( x -- x x ) */ @@ -1019,3 +1847,120 @@ static void loop_j(void) { PUSH(rstack[rstackcnt - 2]); } + +/* words[] is a function array of all native code functions used by + * the dictionary, i.e. CFAs and primitives. + * Any change here needs a matching change in the primitive word's + * name list that is kept for bootstrapping in kernel/bootstrap.c + * + * NOTE: THIS LIST SHALL NOT CHANGE (EXCEPT MANDATORY ADDITIONS AT + * THE END). ANY OTHER CHANGE WILL BREAK COMPATIBILITY TO OLDER + * BINARY DICTIONARIES. + */ +static forth_word * const words[] = { + /* + * CFAs and special words + */ + semis, + docol, + lit, + docon, + dovar, + dodefer, + dodoes, + dodo, + doisdo, + doloop, + doplusloop, + doival, + doivar, + doidefer, + + /* + * primitives + */ + fdup, /* dup */ + twodup, /* 2dup */ + isdup, /* ?dup */ + over, /* over */ + twoover, /* 2over */ + pick, /* pick */ + drop, /* drop */ + twodrop, /* 2drop */ + nip, /* nip */ + roll, /* roll */ + rot, /* rot */ + minusrot, /* -rot */ + swap, /* swap */ + twoswap, /* 2swap */ + tor, /* >r */ + rto, /* r> */ + rfetch, /* r@ */ + depth, /* depth */ + depthwrite, /* depth! */ + rdepth, /* rdepth */ + rdepthwrite, /* rdepth! */ + plus, /* + */ + minus, /* - */ + mult, /* * */ + umult, /* u* */ + mudivmod, /* mu/mod */ + forthabs, /* abs */ + negate, /* negate */ + max, /* max */ + min, /* min */ + lshift, /* lshift */ + rshift, /* rshift */ + rshifta, /* >>a */ + and, /* and */ + or, /* or */ + xor, /* xor */ + invert, /* invert */ + dplus, /* d+ */ + dminus, /* d- */ + mmult, /* m* */ + ummult, /* um* */ + fetch, /* @ */ + cfetch, /* c@ */ + wfetch, /* w@ */ + lfetch, /* l@ */ + store, /* ! */ + plusstore, /* +! */ + cstore, /* c! */ + wstore, /* w! */ + lstore, /* l! */ + equals, /* = */ + greater, /* > */ + less, /* < */ + ugreater, /* u> */ + uless, /* u< */ + spfetch, /* sp@ */ + fmove, /* move */ + ffill, /* fill */ + emit, /* emit */ + iskey, /* key? */ + key, /* key */ + execute, /* execute */ + here, /* here */ + herewrite, /* here! */ + dobranch, /* dobranch */ + docbranch, /* do?branch */ + unalignedwordread, /* unaligned-w@ */ + unalignedwordwrite, /* unaligned-w! */ + unalignedlongread, /* unaligned-l@ */ + unalignedlongwrite, /* unaligned-l! */ + iocfetch, /* ioc@ */ + iowfetch, /* iow@ */ + iolfetch, /* iol@ */ + iocstore, /* ioc! */ + iowstore, /* iow! */ + iolstore, /* iol! */ + loop_i, /* i */ + loop_j, /* j */ + call, /* call */ + sysdebug, /* sys-debug */ + do_include, /* $include */ + do_encode_file, /* $encode-file */ + do_debug_xt, /* (debug */ + do_debug_off, /* (debug-off) */ +}; diff --git a/kernel/internal.c b/kernel/internal.c deleted file mode 100644 index 0bf9c64..0000000 --- a/kernel/internal.c +++ /dev/null @@ -1,806 +0,0 @@ -/* tag: internal words, inner interpreter and such - * - * Copyright (C) 2003 Patrick Mauritz, Stefan Reinauer - * - * See the file "COPYING" for further information about - * the copyright and warranty status of this work. - */ - -/* - * execution works as follows: - * - PC is pushed on return stack - * - PC is set to new CFA - * - address pointed by CFA is executed by CPU - */ - -#ifndef FCOMPILER -#include "libc/vsprintf.h" -#else -#include <stdarg.h> -#endif - -typedef void forth_word(void); - -static forth_word * const words[]; -ucell PC; -volatile int interruptforth = 0; - -#define DEBUG_MODE_NONE 0 -#define DEBUG_MODE_STEP 1 -#define DEBUG_MODE_TRACE 2 -#define DEBUG_MODE_STEPUP 3 - -#define DEBUG_BANNER "\nStepper keys: <space>/<enter> Up Down Trace Rstack Forth\n" - -/* Empty linked list of debug xts */ -struct debug_xt { - ucell xt_docol; - ucell xt_semis; - int mode; - struct debug_xt *next; -}; - -static struct debug_xt debug_xt_eol = { (ucell)0, (ucell)0, 0, NULL}; -static struct debug_xt *debug_xt_list = &debug_xt_eol; - -/* Static buffer for xt name */ -char xtname[MAXNFALEN]; - -#ifndef FCOMPILER -/* instead of pointing to an explicit 0 variable we - * point behind the pointer. - */ -static ucell t[] = { 0, 0, 0, 0 }; -static ucell *trampoline = t; - -void forth_init(void) -{ - init_trampoline(trampoline); -} -#endif - -#ifndef CONFIG_DEBUG_INTERPRETER -#define dbg_interp_printk( a... ) do { } while(0) -#else -#define dbg_interp_printk( a... ) printk( a ) -#endif - -#ifndef CONFIG_DEBUG_INTERNAL -#define dbg_internal_printk( a... ) do { } while(0) -#else -#define dbg_internal_printk( a... ) printk( a ) -#endif - - -void init_trampoline(ucell *tramp) -{ - tramp[0] = DOCOL; - tramp[1] = 0; - tramp[2] = target_ucell(pointer2cell(tramp) + 3 * sizeof(ucell)); - tramp[3] = 0; -} - - -static inline void processxt(ucell xt) -{ - void (*tokenp) (void); - - dbg_interp_printk("processxt: pc=%x, xt=%x\n", PC, xt); - tokenp = words[xt]; - tokenp(); -} - -static void docol(void) -{ /* DOCOL */ - PUSHR(PC); - PC = read_ucell(cell2pointer(PC)); - - dbg_interp_printk("docol: %s\n", cell2pointer( lfa2nfa(PC - sizeof(cell)) )); -} - -static void semis(void) -{ - PC = POPR(); -} - -static inline void next(void) -{ - PC += sizeof(ucell); - - dbg_interp_printk("next: PC is now %x\n", PC); - processxt(read_ucell(cell2pointer(read_ucell(cell2pointer(PC))))); -} - -static inline void next_dbg(void); - -int enterforth(xt_t xt) -{ - ucell *_cfa = (ucell*)cell2pointer(xt); - cell tmp; - - if (read_ucell(_cfa) != DOCOL ) { - trampoline[1] = target_ucell(xt); - _cfa = trampoline; - } - - if (rstackcnt < 0) - rstackcnt = 0; - - tmp = rstackcnt; - interruptforth = FORTH_INTSTAT_CLR; - - PUSHR(PC); - PC = pointer2cell(_cfa); - - while (rstackcnt > tmp && !(interruptforth & FORTH_INTSTAT_STOP)) { - if (debug_xt_list->next == NULL) { - while (rstackcnt > tmp && !interruptforth) { - dbg_interp_printk("enterforth: NEXT\n"); - next(); - } - } else { - while (rstackcnt > tmp && !interruptforth) { - dbg_interp_printk("enterforth: NEXT_DBG\n"); - next_dbg(); - } - } - - /* Always clear the debug mode change flag */ - interruptforth = interruptforth & (~FORTH_INTSTAT_DBG); - } - -#if 0 - /* return true if we took an exception. The caller should normally - * handle exceptions by returning immediately since the throw - * is supposed to abort the execution of this C-code too. - */ - - if( rstackcnt != tmp ) - printk("EXCEPTION DETECTED!\n"); -#endif - return rstackcnt != tmp; -} - -/* called inline thus a slightly different behaviour */ -static void lit(void) -{ /* LIT */ - PC += sizeof(cell); - PUSH(read_ucell(cell2pointer(PC))); - dbg_interp_printk("lit: %x\n", read_ucell(cell2pointer(PC))); -} - -static void docon(void) -{ /* DOCON */ - ucell tmp = read_ucell(cell2pointer(read_ucell(cell2pointer(PC)) + sizeof(ucell))); - PUSH(tmp); - dbg_interp_printk("docon: PC=%x, value=%x\n", PC, tmp); -} - -static void dovar(void) -{ /* DOVAR */ - ucell tmp = read_ucell(cell2pointer(PC)) + sizeof(ucell); - PUSH(tmp); /* returns address to variable */ - dbg_interp_printk("dovar: PC: %x, %x\n", PC, tmp); -} - -static void dobranch(void) -{ /* unconditional branch */ - PC += sizeof(cell); - PC += read_cell(cell2pointer(PC)); -} - -static void docbranch(void) -{ /* conditional branch */ - - PC += sizeof(cell); - if (POP()) { - dbg_internal_printk(" ?branch: end loop\n"); - } else { - dbg_internal_printk(" ?branch: follow branch\n"); - PC += read_cell(cell2pointer(PC)); - } -} - - -static void execute(void) -{ /* EXECUTE */ - ucell address = POP(); - dbg_interp_printk("execute: %x\n", address); - - PUSHR(PC); - trampoline[1] = target_ucell(address); - PC = pointer2cell(trampoline); -} - -/* - * call ( ... function-ptr -- ??? ) - */ -static void call(void) -{ -#ifdef FCOMPILER - printk("Sorry. Usage of Forth2C binding is forbidden during bootstrap.\n"); - exit(1); -#else - void (*funcptr) (void); - funcptr=(void *)cell2pointer(POP()); - dbg_interp_printk("call: %x", funcptr); - funcptr(); -#endif -} - -/* - * sys-debug ( errno -- ) - */ - -static void sysdebug(void) -{ -#ifdef FCOMPILER - cell errorno=POP(); - exception(errorno); -#else - (void) POP(); -#endif -} - -static void dodoes(void) -{ /* DODOES */ - ucell data = read_ucell(cell2pointer(PC)) + (2 * sizeof(ucell)); - ucell word = read_ucell(cell2pointer(read_ucell(cell2pointer(PC)) + sizeof(ucell))); - - dbg_interp_printk("DODOES data=%x word=%x\n", data, word); - - PUSH(data); - PUSH(word); - - execute(); -} - -static void dodefer(void) -{ - docol(); -} - -static void dodo(void) -{ - cell startval, endval; - startval = POP(); - endval = POP(); - - PUSHR(endval); - PUSHR(startval); -} - -static void doisdo(void) -{ - cell startval, endval, offset; - - startval = POP(); - endval = POP(); - - PC += sizeof(cell); - - if (startval == endval) { - offset = read_cell(cell2pointer(PC)); - PC += offset; - } else { - PUSHR(endval); - PUSHR(startval); - } -} - -static void doloop(void) -{ - cell offset, startval, endval; - - startval = POPR() + 1; - endval = POPR(); - - PC += sizeof(cell); - - if (startval < endval) { - offset = read_cell(cell2pointer(PC)); - PC += offset; - PUSHR(endval); - PUSHR(startval); - } - -} - -static void doplusloop(void) -{ - ucell high, low; - cell increment, startval, endval, offset; - - increment = POP(); - - startval = POPR(); - endval = POPR(); - - low = (ucell) startval; - startval += increment; - - PC += sizeof(cell); - - if (increment >= 0) { - high = (ucell) startval; - } else { - high = low; - low = (ucell) startval; - } - - if (endval - (low + 1) >= high - low) { - offset = read_cell(cell2pointer(PC)); - PC += offset; - - PUSHR(endval); - PUSHR(startval); - } -} - -/* - * instance handling CFAs - */ -#ifndef FCOMPILER -static ucell get_myself(void) -{ - static ucell *myselfptr = NULL; - if (myselfptr == NULL) - myselfptr = (ucell*)cell2pointer(findword("my-self")) + 1; - ucell *myself = (ucell*)cell2pointer(*myselfptr); - return (myself != NULL) ? *myself : 0; -} - -static void doivar(void) -{ - ucell r, *p = (ucell *)(*(ucell *) cell2pointer(PC) + sizeof(ucell)); - ucell ibase = get_myself(); - - dbg_interp_printk("ivar, offset: %d size: %d (ibase %d)\n", p[0], p[1], ibase ); - - r = ibase ? ibase + p[0] : pointer2cell(&p[2]); - PUSH( r ); -} - -static void doival(void) -{ - ucell r, *p = (ucell *)(*(ucell *) cell2pointer(PC) + sizeof(ucell)); - ucell ibase = get_myself(); - - dbg_interp_printk("ivar, offset: %d size: %d\n", p[0], p[1] ); - - r = ibase ? ibase + p[0] : pointer2cell(&p[2]); - PUSH( *(ucell *)cell2pointer(r) ); -} - -static void doidefer(void) -{ - ucell *p = (ucell *)(*(ucell *) cell2pointer(PC) + sizeof(ucell)); - ucell ibase = get_myself(); - - dbg_interp_printk("doidefer, offset: %d size: %d\n", p[0], p[1] ); - - PUSHR(PC); - PC = ibase ? ibase + p[0] : pointer2cell(&p[2]); - PC -= sizeof(ucell); -} -#else -static void noinstances(void) -{ - printk("Opening devices is not supported during bootstrap. Sorry.\n"); - exit(1); -} -#define doivar noinstances -#define doival noinstances -#define doidefer noinstances -#endif -/* - * $include / $encode-file - */ - -#ifdef FCOMPILER -static void -string_relay( void (*func)(const char *) ) -{ - int len = POP(); - char *name, *p = (char*)cell2pointer(POP()); - name = malloc( len + 1 ); - memcpy( name, p, len ); - name[len]=0; - (*func)( name ); - free( name ); -} -#else -#define string_relay( dummy ) do { DROP(); DROP(); } while(0) -#endif - -static void -do_include( void ) -{ - string_relay( &include_file ); -} - -static void -do_encode_file( void ) -{ - string_relay( &encode_file ); -} - - -/* - * Debug support functions - */ - -static -int printf_console( const char *fmt, ... ) -{ - cell tmp; - - char buf[512]; - va_list args; - int i; - - va_start(args, fmt); - i = vsnprintf(buf, sizeof(buf), fmt, args); - va_end(args); - - /* Push to the Forth interpreter for console output */ - tmp = rstackcnt; - - PUSH(pointer2cell(buf)); - PUSH((int)strlen(buf)); - trampoline[1] = findword("type"); - - PUSHR(PC); - PC = pointer2cell(trampoline); - - while (rstackcnt > tmp) { - dbg_interp_printk("printf_console: NEXT\n"); - next(); - } - - return i; -} - -static -int getchar_console( void ) -{ - cell tmp; - - /* Push to the Forth interpreter for console output */ - tmp = rstackcnt; - - trampoline[1] = findword("key"); - - PUSHR(PC); - PC = pointer2cell(trampoline); - - while (rstackcnt > tmp) { - dbg_interp_printk("getchar_console: NEXT\n"); - next(); - } - - return POP(); -} - -static void -display_dbg_dstack ( void ) -{ - /* Display dstack contents between parentheses */ - int i; - - if (dstackcnt == 0) { - printf_console(" ( Empty ) "); - return; - } else { - printf_console(" ( "); - for (i = 1; i <= dstackcnt; i++) { - if (i != 1) - printf_console(" "); - printf_console("%" FMT_CELL_x, dstack[i]); - } - printf_console(" ) "); - } -} - -static void -display_dbg_rstack ( void ) -{ - /* Display rstack contents between parentheses */ - int i; - - if (rstackcnt == 0) { - printf_console(" ( Empty ) "); - return; - } else { - printf_console("\nR: ( "); - for (i = 1; i <= rstackcnt; i++) { - if (i != 1) - printf_console(" "); - printf_console("%" FMT_CELL_x, rstack[i]); - } - printf_console(" ) \n"); - } -} - -static int -add_debug_xt( ucell xt ) -{ - struct debug_xt *debug_xt_item; - - /* If the xt CFA isn't DOCOL then issue a warning and do nothing */ - if (read_ucell(cell2pointer(xt)) != DOCOL) { - printf_console("\nprimitive words cannot be debugged\n"); - return 0; - } - - /* If this xt is already in the list, do nothing but indicate success */ - for (debug_xt_item = debug_xt_list; debug_xt_item->next != NULL; debug_xt_item = debug_xt_item->next) - if (debug_xt_item->xt_docol == xt) - return 1; - - /* We already have the CFA (PC) indicating the starting cell of the word, however we also - need the ending cell too (we cannot rely on the rstack as it can be arbitrarily - changed by a forth word). Hence the use of findsemis() */ - - /* Otherwise add to the head of the linked list */ - debug_xt_item = malloc(sizeof(struct debug_xt)); - debug_xt_item->xt_docol = xt; - debug_xt_item->xt_semis = findsemis(xt); - debug_xt_item->mode = DEBUG_MODE_NONE; - debug_xt_item->next = debug_xt_list; - debug_xt_list = debug_xt_item; - - /* Indicate debug mode change */ - interruptforth |= FORTH_INTSTAT_DBG; - - /* Success */ - return 1; -} - -static void -del_debug_xt( ucell xt ) -{ - struct debug_xt *debug_xt_item, *tmp_xt_item; - - /* Handle the case where the xt is at the head of the list */ - if (debug_xt_list->xt_docol == xt) { - tmp_xt_item = debug_xt_list; - debug_xt_list = debug_xt_list->next; - free(tmp_xt_item); - - return; - } - - /* Otherwise find this xt in the linked list and remove it */ - for (debug_xt_item = debug_xt_list; debug_xt_item->next != NULL; debug_xt_item = debug_xt_item->next) { - if (debug_xt_item->next->xt_docol == xt) { - tmp_xt_item = debug_xt_item->next; - debug_xt_item->next = debug_xt_item->next->next; - free(tmp_xt_item); - } - } - - /* If the list is now empty, indicate debug mode change */ - if (debug_xt_list->next == NULL) - interruptforth |= FORTH_INTSTAT_DBG; -} - -static void -do_source_dbg( struct debug_xt *debug_xt_item ) -{ - /* Forth source debugger implementation */ - char k, done = 0; - - /* Display current dstack */ - display_dbg_dstack(); - printf_console("\n"); - - fstrncpy(xtname, lfa2nfa(read_ucell(cell2pointer(PC)) - sizeof(cell)), MAXNFALEN); - printf_console("%p: %s ", cell2pointer(PC), xtname); - - /* If in trace mode, we just carry on */ - if (debug_xt_item->mode == DEBUG_MODE_TRACE) - return; - - /* Otherwise in step mode, prompt for a keypress */ - k = getchar_console(); - - /* Only proceed if done is true */ - while (!done) - { - switch (k) { - - case ' ': - case '\n': - /* Perform a single step */ - done = 1; - break; - - case 'u': - case 'U': - /* Up - unmark current word for debug, mark its caller for - * debugging and finish executing current word */ - - /* Since this word could alter the rstack during its execution, - * we only know the caller when (semis) is called for this xt. - * Hence we mark the xt as a special DEBUG_MODE_STEPUP which - * means we run as normal, but schedule the xt for deletion - * at its corresponding (semis) word when we know the rstack - * will be set to its final parent value */ - debug_xt_item->mode = DEBUG_MODE_STEPUP; - done = 1; - break; - - case 'd': - case 'D': - /* Down - mark current word for debug and step into it */ - done = add_debug_xt(read_ucell(cell2pointer(PC))); - if (!done) { - k = getchar_console(); - } - break; - - case 't': - case 'T': - /* Trace mode */ - debug_xt_item->mode = DEBUG_MODE_TRACE; - done = 1; - break; - - case 'r': - case 'R': - /* Display rstack */ - display_dbg_rstack(); - done = 0; - k = getchar_console(); - break; - - case 'f': - case 'F': - /* Start subordinate Forth interpreter */ - PUSHR(PC - sizeof(cell)); - PC = findword("outer-interpreter") + sizeof(ucell); - - /* Save rstack position for when we return */ - dbgrstackcnt = rstackcnt; - done = 1; - break; - - default: - /* Display debug banner */ - printf_console(DEBUG_BANNER); - k = getchar_console(); - } - } -} - -static void docol_dbg(void) -{ /* DOCOL */ - struct debug_xt *debug_xt_item; - - PUSHR(PC); - PC = read_ucell(cell2pointer(PC)); - - /* If current xt is in our debug xt list, display word name */ - debug_xt_item = debug_xt_list; - while (debug_xt_item->next) { - if (debug_xt_item->xt_docol == PC) { - fstrncpy(xtname, lfa2nfa(PC - sizeof(cell)), MAXNFALEN); - printf_console("\n: %s ", xtname); - - /* Step mode is the default */ - debug_xt_item->mode = DEBUG_MODE_STEP; - } - - debug_xt_item = debug_xt_item->next; - } - - dbg_interp_printk("docol_dbg: %s\n", cell2pointer( lfa2nfa(PC - sizeof(cell)) )); -} - -static void semis_dbg(void) -{ - struct debug_xt *debug_xt_item, *debug_xt_up = NULL; - - /* If current semis is in our debug xt list, disable debug mode */ - debug_xt_item = debug_xt_list; - while (debug_xt_item->next) { - if (debug_xt_item->xt_semis == PC) { - if (debug_xt_item->mode != DEBUG_MODE_STEPUP) { - /* Handle the normal case */ - fstrncpy(xtname, lfa2nfa(debug_xt_item->xt_docol - sizeof(cell)), MAXNFALEN); - printf_console("\n[ Finished %s ] ", xtname); - - /* Reset to step mode in case we were in trace mode */ - debug_xt_item->mode = DEBUG_MODE_STEP; - } else { - /* This word requires execution of the debugger "Up" - * semantics. However we can't do this here since we - * are iterating through the debug list, and we need - * to change it. So we do it afterwards. - */ - debug_xt_up = debug_xt_item; - } - } - - debug_xt_item = debug_xt_item->next; - } - - /* Execute debugger "Up" semantics if required */ - if (debug_xt_up) { - /* Only add the parent word if it is not within the trampoline */ - if (rstack[rstackcnt] != (cell)pointer2cell(&trampoline[1])) { - del_debug_xt(debug_xt_up->xt_docol); - add_debug_xt(findxtfromcell(rstack[rstackcnt])); - - fstrncpy(xtname, lfa2nfa(findxtfromcell(rstack[rstackcnt]) - sizeof(cell)), MAXNFALEN); - printf_console("\n[ Up to %s ] ", xtname); - } else { - fstrncpy(xtname, lfa2nfa(findxtfromcell(debug_xt_up->xt_docol) - sizeof(cell)), MAXNFALEN); - printf_console("\n[ Finished %s (Unable to go up, hit trampoline) ] ", xtname); - - del_debug_xt(debug_xt_up->xt_docol); - } - - debug_xt_up = NULL; - } - - PC = POPR(); -} - -static inline void next_dbg(void) -{ - struct debug_xt *debug_xt_item; - void (*tokenp) (void); - - PC += sizeof(ucell); - - /* If the PC lies within a debug range, run the source debugger */ - debug_xt_item = debug_xt_list; - while (debug_xt_item->next) { - if (PC >= debug_xt_item->xt_docol && PC <= debug_xt_item->xt_semis && - debug_xt_item->mode != DEBUG_MODE_STEPUP) { - do_source_dbg(debug_xt_item); - } - - debug_xt_item = debug_xt_item->next; - } - - dbg_interp_printk("next_dbg: PC is now %x\n", PC); - - /* Intercept DOCOL and SEMIS and redirect to debug versions */ - if (read_ucell(cell2pointer(read_ucell(cell2pointer(PC)))) == DOCOL) { - tokenp = docol_dbg; - tokenp(); - } else if (read_ucell(cell2pointer(read_ucell(cell2pointer(PC)))) == DOSEMIS) { - tokenp = semis_dbg; - tokenp(); - } else { - /* Otherwise process as normal */ - processxt(read_ucell(cell2pointer(read_ucell(cell2pointer(PC))))); - } -} - -static void -do_debug_xt( void ) -{ - ucell xt = POP(); - - /* Add to the debug list */ - if (add_debug_xt(xt)) { - /* Display debug banner */ - printf_console(DEBUG_BANNER); - - /* Indicate change to debug mode */ - interruptforth |= FORTH_INTSTAT_DBG; - } -} - -static void -do_debug_off( void ) -{ - /* Empty the debug xt linked list */ - while (debug_xt_list->next != NULL) - del_debug_xt(debug_xt_list->xt_docol); -} - diff --git a/kernel/primitives.c b/kernel/primitives.c deleted file mode 100644 index b433dcd..0000000 --- a/kernel/primitives.c +++ /dev/null @@ -1,148 +0,0 @@ -/* tag: the main file which includes all the prim code headers - * - * Copyright (C) 2003 Patrick Mauritz, Stefan Reinauer - * - * see the file "COPYING" for further information about - * the copyright and warranty status of this work. - */ - -#include "config.h" -#include "sysinclude.h" -#include "kernel/stack.h" -#include "kernel/kernel.h" -#include "dict.h" - -/* - * cross platform abstraction - */ - -#include "cross.h" - -/* - * Code Field Address (CFA) definitions (DOCOL and the like) - */ - -#include "internal.c" - -/* include forth primitives needed to set up - * all the words described in IEEE1275-1994. - */ - -#include "forth.c" - -/* words[] is a function array of all native code functions used by - * the dictionary, i.e. CFAs and primitives. - * Any change here needs a matching change in the primitive word's - * name list that is kept for bootstrapping in kernel/bootstrap.c - * - * NOTE: THIS LIST SHALL NOT CHANGE (EXCEPT MANDATORY ADDITIONS AT - * THE END). ANY OTHER CHANGE WILL BREAK COMPATIBILITY TO OLDER - * BINARY DICTIONARIES. - */ -static forth_word * const words[] = { - /* - * CFAs and special words - */ - semis, - docol, - lit, - docon, - dovar, - dodefer, - dodoes, - dodo, - doisdo, - doloop, - doplusloop, - doival, - doivar, - doidefer, - - /* - * primitives - */ - fdup, /* dup */ - twodup, /* 2dup */ - isdup, /* ?dup */ - over, /* over */ - twoover, /* 2over */ - pick, /* pick */ - drop, /* drop */ - twodrop, /* 2drop */ - nip, /* nip */ - roll, /* roll */ - rot, /* rot */ - minusrot, /* -rot */ - swap, /* swap */ - twoswap, /* 2swap */ - tor, /* >r */ - rto, /* r> */ - rfetch, /* r@ */ - depth, /* depth */ - depthwrite, /* depth! */ - rdepth, /* rdepth */ - rdepthwrite, /* rdepth! */ - plus, /* + */ - minus, /* - */ - mult, /* * */ - umult, /* u* */ - mudivmod, /* mu/mod */ - forthabs, /* abs */ - negate, /* negate */ - max, /* max */ - min, /* min */ - lshift, /* lshift */ - rshift, /* rshift */ - rshifta, /* >>a */ - and, /* and */ - or, /* or */ - xor, /* xor */ - invert, /* invert */ - dplus, /* d+ */ - dminus, /* d- */ - mmult, /* m* */ - ummult, /* um* */ - fetch, /* @ */ - cfetch, /* c@ */ - wfetch, /* w@ */ - lfetch, /* l@ */ - store, /* ! */ - plusstore, /* +! */ - cstore, /* c! */ - wstore, /* w! */ - lstore, /* l! */ - equals, /* = */ - greater, /* > */ - less, /* < */ - ugreater, /* u> */ - uless, /* u< */ - spfetch, /* sp@ */ - fmove, /* move */ - ffill, /* fill */ - emit, /* emit */ - iskey, /* key? */ - key, /* key */ - execute, /* execute */ - here, /* here */ - herewrite, /* here! */ - dobranch, /* dobranch */ - docbranch, /* do?branch */ - unalignedwordread, /* unaligned-w@ */ - unalignedwordwrite, /* unaligned-w! */ - unalignedlongread, /* unaligned-l@ */ - unalignedlongwrite, /* unaligned-l! */ - iocfetch, /* ioc@ */ - iowfetch, /* iow@ */ - iolfetch, /* iol@ */ - iocstore, /* ioc! */ - iowstore, /* iow! */ - iolstore, /* iol! */ - loop_i, /* i */ - loop_j, /* j */ - call, /* call */ - sysdebug, /* sys-debug */ - do_include, /* $include */ - do_encode_file, /* $encode-file */ - do_debug_xt, /* (debug */ - do_debug_off, /* (debug-off) */ -}; -- 1.6.2.4

2 2

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

13 Nov '10

Author: afaerber Date: Sat Nov 13 21:28:20 2010 New Revision: 955 URL: http://tracker.coreboot.org/trac/openbios/changeset/955 Log: ppc: Introduce RFI macro Macro name as seen in Linux. Use of macro suggested by Alex. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/arch/ppc/qemu/start.S trunk/openbios-devel/include/arch/ppc/asmdefs.h Modified: trunk/openbios-devel/arch/ppc/qemu/start.S ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/start.S Sat Nov 13 14:04:34 2010 (r954) +++ trunk/openbios-devel/arch/ppc/qemu/start.S Sat Nov 13 21:28:20 2010 (r955) @@ -234,7 +234,7 @@ ori r3,r3,0x2000 mtsrr1 r3 mfsprg1 r3 - rfi + RFI ILLEGAL_VECTOR( 0x900 ) ILLEGAL_VECTOR( 0xa00 ) Modified: trunk/openbios-devel/include/arch/ppc/asmdefs.h ============================================================================== --- trunk/openbios-devel/include/arch/ppc/asmdefs.h Sat Nov 13 14:04:34 2010 (r954) +++ trunk/openbios-devel/include/arch/ppc/asmdefs.h Sat Nov 13 21:28:20 2010 (r955) @@ -88,6 +88,12 @@ addi (D), (D), LO(x) #endif +#ifdef __powerpc64__ +#define RFI rfid +#else +#define RFI rfi +#endif + #ifndef __darwin__ #define GLOBL( name ) .globl name ; name #define EXTERN( name ) name

1 0

[commit] r954 - in trunk/openbios-devel: arch/amd64 arch/ppc arch/ppc/qemu arch/sparc32 arch/sparc64 arch/unix arch/x86 include/kernel kernel
by repository service 13 Nov '10

13 Nov '10

Author: afaerber Date: Sat Nov 13 14:04:34 2010 New Revision: 954 URL: http://tracker.coreboot.org/trac/openbios/changeset/954 Log: Introduce forth_init() for trampoline initialization Use init_trampoline() for trampoline variable initialization. Add calls to a new forth_init() function for each architecture to invoke it. Idea courtesy of Blue. This fixes ppc64 compilation by avoiding a casted self-reference. v2: * Share init_trampoline() with kernel/bootstrap.c, suggested by Mark. * Adopt QEMU coding style for new functions. Cc: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Acked-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/amd64/openbios.c trunk/openbios-devel/arch/ppc/kernel.c trunk/openbios-devel/arch/ppc/qemu/kernel.c trunk/openbios-devel/arch/sparc32/openbios.c trunk/openbios-devel/arch/sparc64/openbios.c trunk/openbios-devel/arch/unix/unix.c trunk/openbios-devel/arch/x86/openbios.c trunk/openbios-devel/include/kernel/kernel.h trunk/openbios-devel/kernel/bootstrap.c trunk/openbios-devel/kernel/internal.c Modified: trunk/openbios-devel/arch/amd64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/amd64/openbios.c Sat Nov 13 11:56:45 2010 (r953) +++ trunk/openbios-devel/arch/amd64/openbios.c Sat Nov 13 14:04:34 2010 (r954) @@ -67,6 +67,7 @@ load_dictionary((char *)sys_info.dict_start, sys_info.dict_end-sys_info.dict_start); + forth_init(); relocate(&sys_info); Modified: trunk/openbios-devel/arch/ppc/kernel.c ============================================================================== --- trunk/openbios-devel/arch/ppc/kernel.c Sat Nov 13 11:56:45 2010 (r953) +++ trunk/openbios-devel/arch/ppc/kernel.c Sat Nov 13 14:04:34 2010 (r954) @@ -83,6 +83,7 @@ { dict = malloc(DICTIONARY_SIZE); load_dictionary( forth_dictionary, sizeof(forth_dictionary) ); + forth_init(); PUSH_xt( bind_noname_func(arch_of_init) ); fword("PREPOST-initializer"); Modified: trunk/openbios-devel/arch/ppc/qemu/kernel.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/kernel.c Sat Nov 13 11:56:45 2010 (r953) +++ trunk/openbios-devel/arch/ppc/qemu/kernel.c Sat Nov 13 14:04:34 2010 (r954) @@ -86,6 +86,7 @@ dictlimit = DICTIONARY_SIZE; load_dictionary( forth_dictionary, sizeof(forth_dictionary) ); + forth_init(); PUSH_xt( bind_noname_func(arch_of_init) ); fword("PREPOST-initializer"); Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Sat Nov 13 11:56:45 2010 (r953) +++ trunk/openbios-devel/arch/sparc32/openbios.c Sat Nov 13 14:04:34 2010 (r954) @@ -970,6 +970,7 @@ load_dictionary((char *)sys_info.dict_start, (unsigned long)sys_info.dict_end - (unsigned long)sys_info.dict_start); + forth_init(); #ifdef CONFIG_DEBUG_BOOT printk("forth started.\n"); Modified: trunk/openbios-devel/arch/sparc64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c Sat Nov 13 11:56:45 2010 (r953) +++ trunk/openbios-devel/arch/sparc64/openbios.c Sat Nov 13 14:04:34 2010 (r954) @@ -623,6 +623,7 @@ load_dictionary((char *)sys_info.dict_start, (unsigned long)sys_info.dict_end - (unsigned long)sys_info.dict_start); + forth_init(); #ifdef CONFIG_DEBUG_BOOT printk("forth started.\n"); Modified: trunk/openbios-devel/arch/unix/unix.c ============================================================================== --- trunk/openbios-devel/arch/unix/unix.c Sat Nov 13 11:56:45 2010 (r953) +++ trunk/openbios-devel/arch/unix/unix.c Sat Nov 13 14:04:34 2010 (r954) @@ -516,6 +516,7 @@ printk("done.\n"); read_dictionary(argv[optind]); + forth_init(); PUSH_xt( bind_noname_func(arch_init) ); fword("PREPOST-initializer"); Modified: trunk/openbios-devel/arch/x86/openbios.c ============================================================================== --- trunk/openbios-devel/arch/x86/openbios.c Sat Nov 13 11:56:45 2010 (r953) +++ trunk/openbios-devel/arch/x86/openbios.c Sat Nov 13 14:04:34 2010 (r954) @@ -90,6 +90,7 @@ load_dictionary((char *)sys_info.dict_start, (unsigned long)sys_info.dict_end - (unsigned long)sys_info.dict_start); + forth_init(); relocate(&sys_info); Modified: trunk/openbios-devel/include/kernel/kernel.h ============================================================================== --- trunk/openbios-devel/include/kernel/kernel.h Sat Nov 13 11:56:45 2010 (r953) +++ trunk/openbios-devel/include/kernel/kernel.h Sat Nov 13 14:04:34 2010 (r954) @@ -32,6 +32,8 @@ extern xt_t findword(const char *s1); extern void modules_init( void ); +extern void init_trampoline(ucell *t); +extern void forth_init(void); /* arch kernel hooks */ extern void exception(cell no); Modified: trunk/openbios-devel/kernel/bootstrap.c ============================================================================== --- trunk/openbios-devel/kernel/bootstrap.c Sat Nov 13 11:56:45 2010 (r953) +++ trunk/openbios-devel/kernel/bootstrap.c Sat Nov 13 14:04:34 2010 (r954) @@ -91,20 +91,6 @@ "$include", "$encode-file", "(debug", "(debug-off)" }; -static void init_trampoline(void) -{ - if (!trampoline) { - /* We're using side effects which is to some extent nasty */ - printf("WARNING: no trampoline!\n"); - return; - } - - trampoline[0]=DOCOL; - trampoline[1]=0; - trampoline[2]=target_ucell(pointer2cell(trampoline)+3*sizeof(ucell)); - trampoline[3]=0; -} - /* * dictionary related functions. */ @@ -1180,7 +1166,12 @@ TRAMPOLINE_SIZE); #endif - init_trampoline(); + if (trampoline == NULL) { + /* We're using side effects which is to some extent nasty */ + printf("WARNING: no trampoline!\n"); + } else { + init_trampoline(trampoline); + } if (!segfault) { if (verbose) Modified: trunk/openbios-devel/kernel/internal.c ============================================================================== --- trunk/openbios-devel/kernel/internal.c Sat Nov 13 11:56:45 2010 (r953) +++ trunk/openbios-devel/kernel/internal.c Sat Nov 13 14:04:34 2010 (r954) @@ -50,8 +50,13 @@ /* instead of pointing to an explicit 0 variable we * point behind the pointer. */ -static ucell t[] = { DOCOL, 0, (ucell)(t+3), 0 }; +static ucell t[] = { 0, 0, 0, 0 }; static ucell *trampoline = t; + +void forth_init(void) +{ + init_trampoline(trampoline); +} #endif #ifndef CONFIG_DEBUG_INTERPRETER @@ -67,6 +72,15 @@ #endif +void init_trampoline(ucell *tramp) +{ + tramp[0] = DOCOL; + tramp[1] = 0; + tramp[2] = target_ucell(pointer2cell(tramp) + 3 * sizeof(ucell)); + tramp[3] = 0; +} + + static inline void processxt(ucell xt) { void (*tokenp) (void);

1 0

[commit] r953 - trunk/openbios-devel/kernel
by repository service 13 Nov '10

13 Nov '10

Author: blueswirl Date: Sat Nov 13 11:56:45 2010 New Revision: 953 URL: http://tracker.coreboot.org/trac/openbios/changeset/953 Log: bootstrap: avoid a warning from OpenBSD linker Avoid this link time warning by using strdup(): host/kernel/bootstrap.o(.text+0x854): In function `fopen_include': ../kernel/bootstrap.c:479: warning: strcpy() is almost always misused, please use strlcpy() Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/kernel/bootstrap.c Modified: trunk/openbios-devel/kernel/bootstrap.c ============================================================================== --- trunk/openbios-devel/kernel/bootstrap.c Wed Nov 10 23:35:39 2010 (r952) +++ trunk/openbios-devel/kernel/bootstrap.c Sat Nov 13 11:56:45 2010 (r953) @@ -475,8 +475,7 @@ #ifdef CONFIG_DEBUG_INTERPRETER printk("Including '%s'\n", name ); #endif - srcfilenames [ cursrc ] = malloc(strlen(fil) + 1); - strcpy(srcfilenames[ cursrc ], fil); + srcfilenames[cursrc] = strdup(fil); srclines [ cursrc ] = 1; srcfiles [ cursrc++ ] = ret;

3 3

a couple of problem while compiling and running openfirmware on qemu
by Gleb Natapov 13 Nov '10

13 Nov '10

[Resending. Wasn't subscribed to the list and it looks like it is required to post, but if first mail got through sorry] Hello, I tried to compile openfirmware for qemu like described here http://www.openfirmware.info/Building_OFW_for_QEMU. But after running make in cpu/x86/pc/emu/build on 64bit host I get linkage error: ld -T inflate.ld inflate.lo -o inflate.o ld: i386 architecture of input file `inflate.lo' is incompatible with i386:x86-64 output After applying this patch: Index: cpu/x86/Linux/Makefile =================================================================== --- cpu/x86/Linux/Makefile (revision 1996) +++ cpu/x86/Linux/Makefile (working copy) @@ -34,7 +34,7 @@ ${CC} -c -m32 -Wall -fno-stack-protector -ffreestanding -D_FORTIFY_SOURCE=0 -DNEED_BCOPY -O3 -fpic $< -o $@ inflate.o: inflate.lo - ${LD} -T inflate.ld $< -o $@ + ${LD} -melf_i386 -T inflate.ld $< -o $@ ../build/inflate.bin: inflate.o objcopy -O binary $< $@ ==== compilation goes a little bit further but now it stops with: ./build emuofw.rom --- Rebuilding ohci.fc --- Cmd: ${HOSTDIR}/forth ${HOSTDIR}/../build/builder.dic ../ohci.bth ${BP}/dev/usb2/hcd/ohci/ohci.fth:25: my-w@ ? don't know much forth so just commented every line that gave me an error: Index: dev/usb2/hcd/ohci/ohci.fth =================================================================== --- dev/usb2/hcd/ohci/ohci.fth (revision 1996) +++ dev/usb2/hcd/ohci/ohci.fth (working copy) @@ -22,12 +22,12 @@ 0 value ohci-reg : map-regs ( -- ) - 4 my-w@ h# 16 or 4 my-w! - 0 0 my-space h# 0200.0010 + 1000 map-in to ohci-reg +\ 4 my-w@ h# 16 or 4 my-w! +\ 0 0 my-space h# 0200.0010 + 1000 map-in to ohci-reg ; : unmap-regs ( -- ) - ohci-reg 1000 map-out 0 to ohci-reg +\ ohci-reg 1000 map-out 0 to ohci-reg ; : ohci-reg@ ( idx -- data ) ohci-reg + rl@ ; ======== After that compilation finally succeeded. Produced rom image runs fine on qemu, but fails on qemu-kvm with error: BUG: kvm_dirty_pages_log_change: invalid parameters 0000000010000000-0000000010ffffff Looking into it it seams like openfirmware configure cirrus framebuffer to be at address 0x10000000, but later it configures nic memory BAR with the same address (during device enumeration perhaps). Later it deconfigures nic again. Qemu somehow handles this fine, but qemu-kvm doesn't. This shouldn't work on real HW too FWIW. -- Gleb.

3 3

[commit] r952 - trunk/openbios-devel/drivers
by repository service 10 Nov '10

10 Nov '10

Author: afaerber Date: Wed Nov 10 23:35:39 2010 New Revision: 952 URL: http://tracker.coreboot.org/trac/openbios/changeset/952 Log: cuda: Use FMT_plx Use new FMT_plx format for ppc64-compatible trace output. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/drivers/cuda.c Modified: trunk/openbios-devel/drivers/cuda.c ============================================================================== --- trunk/openbios-devel/drivers/cuda.c Tue Nov 9 23:50:48 2010 (r951) +++ trunk/openbios-devel/drivers/cuda.c Wed Nov 10 23:35:39 2010 (r952) @@ -376,7 +376,7 @@ phandle_t aliases; base += IO_CUDA_OFFSET; - CUDA_DPRINTF(" base=%08x\n", base); + CUDA_DPRINTF(" base=" FMT_plx "\n", base); cuda = malloc(sizeof(cuda_t)); if (cuda == NULL) return NULL;

1 0

[commit] r951 - in trunk/openbios-devel: include/kernel kernel
by repository service 09 Nov '10

09 Nov '10

Author: afaerber Date: Tue Nov 9 23:50:48 2010 New Revision: 951 URL: http://tracker.coreboot.org/trac/openbios/changeset/951 Log: Convert cell2pointer() and pointer2cell() macros to inline functions Inline functions suggested by Blue. Use const void* for pointer2cell() due to const char* arguments. Fix a misuse of pointer2cell(). Drop comment on reusing different host bitness code path; any special handling for different target bitnesses should go into these new functions. v2: * Use QEMU-style indentation for new inline functions. Cc: Blue Swirl <blauwirbel(a)gmail.com> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/include/kernel/stack.h trunk/openbios-devel/kernel/internal.c Modified: trunk/openbios-devel/include/kernel/stack.h ============================================================================== --- trunk/openbios-devel/include/kernel/stack.h Tue Nov 9 21:12:35 2010 (r950) +++ trunk/openbios-devel/include/kernel/stack.h Tue Nov 9 23:50:48 2010 (r951) @@ -31,9 +31,17 @@ #ifdef NATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -// XXX Check whether we can take the larger-than code path for ppc64 instead. -#define pointer2cell(x) ((ucell)(uintptr_t)(x)) -#define cell2pointer(x) ((u8 *)(uintptr_t)(x)) + +static inline ucell pointer2cell(const void* x) +{ + return (ucell)(uintptr_t)x; +} + +static inline void* cell2pointer(ucell x) +{ + return (void*)(uintptr_t)x; +} + #endif static inline void PUSH(ucell value) { Modified: trunk/openbios-devel/kernel/internal.c ============================================================================== --- trunk/openbios-devel/kernel/internal.c Tue Nov 9 21:12:35 2010 (r950) +++ trunk/openbios-devel/kernel/internal.c Tue Nov 9 23:50:48 2010 (r951) @@ -645,7 +645,7 @@ case 'F': /* Start subordinate Forth interpreter */ PUSHR(PC - sizeof(cell)); - PC = pointer2cell(findword("outer-interpreter")) + sizeof(ucell); + PC = findword("outer-interpreter") + sizeof(ucell); /* Save rstack position for when we return */ dbgrstackcnt = rstackcnt;

1 0

[commit] r950 - trunk/openbios-devel/config/scripts
by repository service 09 Nov '10

09 Nov '10

Author: blueswirl Date: Tue Nov 9 21:12:35 2010 New Revision: 950 URL: http://tracker.coreboot.org/trac/openbios/changeset/950 Log: Add support to -linux-gcc style cross compilers Check for -linux-gcc cross compilers in addition to -linux-gnu-gcc. 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 Mon Nov 8 22:12:36 2010 (r949) +++ trunk/openbios-devel/config/scripts/switch-arch Tue Nov 9 21:12:35 2010 (r950) @@ -97,7 +97,7 @@ select_prefix() { - for TARGET in ${1}-linux-gnu- ${1}-elf- ${1}-eabi- + for TARGET in ${1}-linux-gnu- ${1}-linux- ${1}-elf- ${1}-eabi- do if type ${TARGET}gcc > /dev/null 2>&1 then

1 0

[PATCH] Introduce forth_init() for trampoline initialization
by Andreas Färber 09 Nov '10

09 Nov '10

Move trampoline variable initialization to init_trampoline(), like in kernel/bootstrap.c. Add calls to a new forth_init() function for each architecture to invoke it. Idea courtesy of Blue. This fixes ppc64 compilation by avoiding a casted self-reference. Cc: Blue Swirl <blauwirbel(a)gmail.com> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> --- Tested this on ppc, sparc32, sparc64 - OpenBIOS still boots up. forth_init() placement in internal.c may not be perfect but it fits its current purpose... arch/amd64/openbios.c | 1 + arch/ppc/kernel.c | 1 + arch/ppc/qemu/kernel.c | 1 + arch/sparc32/openbios.c | 1 + arch/sparc64/openbios.c | 1 + arch/unix/unix.c | 1 + arch/x86/openbios.c | 1 + include/kernel/kernel.h | 1 + kernel/internal.c | 15 ++++++++++++++- 9 files changed, 22 insertions(+), 1 deletions(-) diff --git a/arch/amd64/openbios.c b/arch/amd64/openbios.c index df43943..db138ad 100644 --- a/arch/amd64/openbios.c +++ b/arch/amd64/openbios.c @@ -67,6 +67,7 @@ int openbios(void) load_dictionary((char *)sys_info.dict_start, sys_info.dict_end-sys_info.dict_start); + forth_init(); relocate(&sys_info); diff --git a/arch/ppc/kernel.c b/arch/ppc/kernel.c index 57efde7..28f2965 100644 --- a/arch/ppc/kernel.c +++ b/arch/ppc/kernel.c @@ -83,6 +83,7 @@ initialize_forth( void ) { dict = malloc(DICTIONARY_SIZE); load_dictionary( forth_dictionary, sizeof(forth_dictionary) ); + forth_init(); PUSH_xt( bind_noname_func(arch_of_init) ); fword("PREPOST-initializer"); diff --git a/arch/ppc/qemu/kernel.c b/arch/ppc/qemu/kernel.c index dbfca57..4cae525 100644 --- a/arch/ppc/qemu/kernel.c +++ b/arch/ppc/qemu/kernel.c @@ -86,6 +86,7 @@ initialize_forth( void ) dictlimit = DICTIONARY_SIZE; load_dictionary( forth_dictionary, sizeof(forth_dictionary) ); + forth_init(); PUSH_xt( bind_noname_func(arch_of_init) ); fword("PREPOST-initializer"); diff --git a/arch/sparc32/openbios.c b/arch/sparc32/openbios.c index e368d6c..1c86752 100644 --- a/arch/sparc32/openbios.c +++ b/arch/sparc32/openbios.c @@ -970,6 +970,7 @@ int openbios(void) load_dictionary((char *)sys_info.dict_start, (unsigned long)sys_info.dict_end - (unsigned long)sys_info.dict_start); + forth_init(); #ifdef CONFIG_DEBUG_BOOT printk("forth started.\n"); diff --git a/arch/sparc64/openbios.c b/arch/sparc64/openbios.c index 49bbe27..8c08814 100644 --- a/arch/sparc64/openbios.c +++ b/arch/sparc64/openbios.c @@ -623,6 +623,7 @@ int openbios(void) load_dictionary((char *)sys_info.dict_start, (unsigned long)sys_info.dict_end - (unsigned long)sys_info.dict_start); + forth_init(); #ifdef CONFIG_DEBUG_BOOT printk("forth started.\n"); diff --git a/arch/unix/unix.c b/arch/unix/unix.c index f1c18df..5e95b69 100644 --- a/arch/unix/unix.c +++ b/arch/unix/unix.c @@ -516,6 +516,7 @@ int main(int argc, char *argv[]) printk("done.\n"); read_dictionary(argv[optind]); + forth_init(); PUSH_xt( bind_noname_func(arch_init) ); fword("PREPOST-initializer"); diff --git a/arch/x86/openbios.c b/arch/x86/openbios.c index 62ef587..24b886d 100644 --- a/arch/x86/openbios.c +++ b/arch/x86/openbios.c @@ -90,6 +90,7 @@ int openbios(void) load_dictionary((char *)sys_info.dict_start, (unsigned long)sys_info.dict_end - (unsigned long)sys_info.dict_start); + forth_init(); relocate(&sys_info); diff --git a/include/kernel/kernel.h b/include/kernel/kernel.h index 15605b5..87812e9 100644 --- a/include/kernel/kernel.h +++ b/include/kernel/kernel.h @@ -32,6 +32,7 @@ extern void panic(const char *error) __attribute__ ((noreturn)); extern xt_t findword(const char *s1); extern void modules_init( void ); +extern void forth_init(void); /* arch kernel hooks */ extern void exception(cell no); diff --git a/kernel/internal.c b/kernel/internal.c index 760c66d..0e3794a 100644 --- a/kernel/internal.c +++ b/kernel/internal.c @@ -50,8 +50,21 @@ char xtname[MAXNFALEN]; /* instead of pointing to an explicit 0 variable we * point behind the pointer. */ -static ucell t[] = { DOCOL, 0, (ucell)(t+3), 0 }; +static ucell t[] = { 0, 0, 0, 0 }; static ucell *trampoline = t; + +static void init_trampoline(void) +{ + trampoline[0] = DOCOL; + trampoline[1] = 0; + trampoline[2] = pointer2cell(&trampoline[3]); + trampoline[3] = 0; +} + +void forth_init(void) +{ + init_trampoline(); +} #endif #ifndef CONFIG_DEBUG_INTERPRETER -- 1.7.3

2 2

[commit] r949 - in trunk/openbios-devel/include/arch: amd64 ia64 ppc sparc32 sparc64 x86
by repository service 09 Nov '10

09 Nov '10

Author: afaerber Date: Mon Nov 8 22:12:36 2010 New Revision: 949 URL: http://tracker.coreboot.org/trac/openbios/changeset/949 Log: Introduce FMT_plx for phys_addr_t Define a zero-padded format string to be used for phys_addr_t arguments. Introduce PRIx{32,64} macros as needed. v2: * Also define PRIx32 for sparc32 and sparc64, requested by Blue. Cc: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Cc: Blue Swirl <blauwirbel(a)gmail.com> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/include/arch/amd64/types.h trunk/openbios-devel/include/arch/ia64/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 Modified: trunk/openbios-devel/include/arch/amd64/types.h ============================================================================== --- trunk/openbios-devel/include/arch/amd64/types.h Sun Nov 7 19:08:41 2010 (r948) +++ trunk/openbios-devel/include/arch/amd64/types.h Mon Nov 8 22:12:36 2010 (r949) @@ -17,8 +17,11 @@ #include "autoconf.h" /* physical address */ + typedef uint64_t phys_addr_t; +#define FMT_plx "%016" PRIx64 + /* cell based types */ typedef long long cell; Modified: trunk/openbios-devel/include/arch/ia64/types.h ============================================================================== --- trunk/openbios-devel/include/arch/ia64/types.h Sun Nov 7 19:08:41 2010 (r948) +++ trunk/openbios-devel/include/arch/ia64/types.h Mon Nov 8 22:12:36 2010 (r949) @@ -18,8 +18,11 @@ #include <endian.h> /* physical address */ + typedef uint64_t phys_addr_t; +#define FMT_plx "%016" PRIx64 + /* cell based types */ typedef int64_t cell; Modified: trunk/openbios-devel/include/arch/ppc/types.h ============================================================================== --- trunk/openbios-devel/include/arch/ppc/types.h Sun Nov 7 19:08:41 2010 (r948) +++ trunk/openbios-devel/include/arch/ppc/types.h Mon Nov 8 22:12:36 2010 (r949) @@ -25,6 +25,9 @@ typedef int int32_t; typedef long long int64_t; typedef long intptr_t; + +#define PRIx32 "x" +#define PRIx64 "llx" #endif /* endianess */ @@ -33,8 +36,10 @@ /* physical address */ #if defined(__powerpc64__) typedef uint64_t phys_addr_t; +#define FMT_plx "%016" PRIx64 #else typedef uint32_t phys_addr_t; +#define FMT_plx "%08" PRIx32 #endif /* cell based types */ Modified: trunk/openbios-devel/include/arch/sparc32/types.h ============================================================================== --- trunk/openbios-devel/include/arch/sparc32/types.h Sun Nov 7 19:08:41 2010 (r948) +++ trunk/openbios-devel/include/arch/sparc32/types.h Mon Nov 8 22:12:36 2010 (r949) @@ -25,14 +25,20 @@ typedef int int32_t; typedef long long int64_t; typedef long intptr_t; + +#define PRIx32 "x" +#define PRIx64 "llx" #endif /* endianess */ #include "autoconf.h" /* physical address: 36 bits */ + typedef uint64_t phys_addr_t; +#define FMT_plx "%09" PRIx64 + /* cell based types */ typedef int32_t cell; Modified: trunk/openbios-devel/include/arch/sparc64/types.h ============================================================================== --- trunk/openbios-devel/include/arch/sparc64/types.h Sun Nov 7 19:08:41 2010 (r948) +++ trunk/openbios-devel/include/arch/sparc64/types.h Mon Nov 8 22:12:36 2010 (r949) @@ -25,6 +25,9 @@ typedef int int32_t; typedef long long int64_t; typedef long intptr_t; + +#define PRIx32 "x" +#define PRIx64 "llx" #endif /* endianess */ @@ -33,6 +36,8 @@ /* physical address */ typedef uint64_t phys_addr_t; +#define FMT_plx "%016" PRIx64 + /* cell based types */ typedef long long cell; typedef unsigned long long ucell; Modified: trunk/openbios-devel/include/arch/x86/types.h ============================================================================== --- trunk/openbios-devel/include/arch/x86/types.h Sun Nov 7 19:08:41 2010 (r948) +++ trunk/openbios-devel/include/arch/x86/types.h Mon Nov 8 22:12:36 2010 (r949) @@ -18,8 +18,11 @@ #include "autoconf.h" /* physical address: XXX theoretically 36 bits for PAE */ + typedef uint32_t phys_addr_t; +#define FMT_plx "%08" PRIx32 + /* cell based types */ typedef int32_t cell;

3 3

[commit] r948 - trunk/openbios-devel/arch/ppc/qemu
by repository service 07 Nov '10

07 Nov '10

Author: afaerber Date: Sun Nov 7 19:08:41 2010 New Revision: 948 URL: http://tracker.coreboot.org/trac/openbios/changeset/948 Log: ppc: Fix indentation Tab-indent to match surrounding code. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sun Nov 7 17:51:47 2010 (r947) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sun Nov 7 19:08:41 2010 (r948) @@ -395,7 +395,7 @@ /* SDR1: Storage Description Register 1 */ hash_base = (ramsize - 0x00100000 - HASH_SIZE) & hash_mask; - memset((void *)hash_base, 0, HASH_SIZE); + memset((void *)hash_base, 0, HASH_SIZE); sdr1 = hash_base | ((HASH_SIZE-1) >> 16); asm volatile("mtsdr1 %0" :: "r" (sdr1) );

1 0

[PATCH] ppc: Fix /memory reg property
by Andreas Färber 07 Nov '10

07 Nov '10

Physical address and size were both using two cells instead of one, and their order was wrong. This would happen to work for RAM < 4 GB, since the clear high address bits would happen to match the zero-based memory location. It would indicate a second bank of size zero though. Switch the value order and use encode-phys in preparation for ppc64. This tidies the output of the Haiku boot loader. Cc: Alexander Graf <agraf(a)suse.de> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> --- arch/ppc/qemu/init.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/arch/ppc/qemu/init.c b/arch/ppc/qemu/init.c index bfd147a..c5da992 100644 --- a/arch/ppc/qemu/init.c +++ b/arch/ppc/qemu/init.c @@ -730,15 +730,9 @@ arch_of_init( void ) /* all memory */ - PUSH(ram_size >> 32); - fword("encode-int"); - PUSH(ram_size & 0xffffffff); - fword("encode-int"); - fword("encode+"); - PUSH(0); - fword("encode-int"); - fword("encode+"); PUSH(0); + fword("encode-phys"); + PUSH(ram_size & 0xffffffff); fword("encode-int"); fword("encode+"); push_str("reg"); -- 1.7.3

2 4

[commit] r947 - trunk/openbios-devel/arch/ppc/qemu
by repository service 07 Nov '10

07 Nov '10

Author: afaerber Date: Sun Nov 7 17:51:47 2010 New Revision: 947 URL: http://tracker.coreboot.org/trac/openbios/changeset/947 Log: ppc: Fix /memory reg property Physical address and size were both using two cells instead of one, and their order was wrong. This would happen to work for RAM < 4 GB, since the clear high address bits would happen to match the zero-based memory location. It would indicate a second bank of size zero though. Switch the value order and use encode-phys in preparation for ppc64. This tidies the output of the Haiku boot loader. v2: * Document TODOs for ppc64, requested by Alex. Cc: Alexander Graf <agraf(a)suse.de> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sat Nov 6 02:17:02 2010 (r946) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sun Nov 7 17:51:47 2010 (r947) @@ -730,15 +730,12 @@ /* all memory */ - PUSH(ram_size >> 32); - fword("encode-int"); - PUSH(ram_size & 0xffffffff); - fword("encode-int"); - fword("encode+"); - PUSH(0); - fword("encode-int"); - fword("encode+"); + /* TODO Adjust this when #address-cells gets increased for ppc64. */ PUSH(0); + fword("encode-phys"); + /* This needs adjusting if #size-cells gets increased. + Alternatively use multiple (address, size) tuples. */ + PUSH(ram_size & 0xffffffff); fword("encode-int"); fword("encode+"); push_str("reg");

1 0

OFMEM and physical addresses
by Mark Cave-Ayland 07 Nov '10

07 Nov '10

Hi all, I've spent a few hours looking at converting SPARC32 over to OFMEM and have hit a fairly fundamental hurdle at the start - the OFMEM code doesn't handle physical addresses properly. In terms of mapping I/O devices into address space, the first problem is with the ofmem_arch_early_map_pages() API which looks like this: ofmem_arch_early_map_pages(ucell phys, ucell virt, ucell size, ucell mode); The problem here is that when setting up the QEMU firmware configuration interface with an address of 0xd00000510, once we hit the page mapping functions we lose the top 8 bits of the physical address since sizeof(phys_addr_t) > size(ucell) on SPARC32. This causes incorrect physical address mappings. My current thinking is that all physical addresses should be changed to phys_addr_t in the OFMEM APIs, but this is slightly more complicated because the same range_t structure is used for storing both physical and virtual range mappings. I believe that if I change the OFMEM range_t structure to use phys_addr_t instead of ucell then this should work assuming that sizeof(phys_addr_t) is always >= sizeof(ucell). Looking at the OF spec it seems that all virtual addresses always fit within 1 Forth cell, and so virtual addresses should be fine in their present form. Can anyone see a flaw in the above logic before I go ahead and code it up? ATB, Mark. -- Mark Cave-Ayland - Senior Technical Architect PostgreSQL - PostGIS Sirius Corporation plc - control through freedom http://www.siriusit.co.uk t: +44 870 608 0063 Sirius Labs: http://www.siriusit.co.uk/labs

3 5

[commit] r946 - trunk/openbios-devel/forth/admin
by repository service 06 Nov '10

06 Nov '10

Author: afaerber Date: Sat Nov 6 02:17:02 2010 New Revision: 946 URL: http://tracker.coreboot.org/trac/openbios/changeset/946 Log: Optimize .properties array display by 0.r Introduce a 0.r word, suggested by Segher. Optimize r890 by using this helper. v4: * Replace ." " by space word, suggested by Segher. Signed-off-by: Segher Boessenkool <segher(a)kernel.crashing.org> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Acked-by: Segher Boessenkool <segher(a)kernel.crashing.org> Modified: trunk/openbios-devel/forth/admin/devices.fs Modified: trunk/openbios-devel/forth/admin/devices.fs ============================================================================== --- trunk/openbios-devel/forth/admin/devices.fs Tue Nov 2 23:16:32 2010 (r945) +++ trunk/openbios-devel/forth/admin/devices.fs Sat Nov 6 02:17:02 2010 (r946) @@ -276,6 +276,11 @@ . ; +\ Print a number zero-padded +: 0.r ( u minlen -- ) + 0 swap <# 1 ?do # loop #s #> type +; + : .p-bytes? ( data len -- 1 | data len 0 ) ." -- " dup . ." : " swap >r 0 @@ -283,7 +288,7 @@ dup r@ + c@ ( len n ch ) - pocket tohexstr dup 2 <> if ." 0" then type ." " + 2 0.r space 1+ repeat 2drop r> drop 1

1 0

[PATCH 0/4] Paving the way for ppc64
by Andreas Färber 02 Nov '10

02 Nov '10

Hello, With these patches and a hack such as the following I am able to build and debug into ppc64 OpenBIOS: diff --git a/kernel/internal.c b/kernel/internal.c index 91ab440..d1fd850 100644 --- a/kernel/internal.c +++ b/kernel/internal.c @@ -50,7 +50,11 @@ char xtname[MAXNFALEN]; /* instead of pointing to an explicit 0 variable we * point behind the pointer. */ +#ifdef __powerpc64__ +static ucell t[] = { DOCOL, 0, 0, 0 }; +#else static ucell t[] = { DOCOL, 0, (ucell)(t+3), 0 }; +#endif static ucell *trampoline = t; #endif This hack does not matter yet as we don't return from setup_mmu() anyway. I have some more fixes related to exception preamble and epilogue cooking but that needs some more thought for a sane interim solution. Regards, Andreas Andreas Färber (4): ppc: Use vector-local version of exception_return ppc64: Don't disable SF bit ppc: Introduce load() macro for ppc64 ppc: Avoid vector overlap on ppc64 arch/ppc/qemu/start.S | 76 +++++++++++++++++++++++++++++++------------------ 1 files changed, 48 insertions(+), 28 deletions(-) -- 1.7.3

2 10

[commit] r945 - trunk/openbios-devel/arch/ppc/qemu
by repository service 02 Nov '10

02 Nov '10

Author: afaerber Date: Tue Nov 2 23:16:32 2010 New Revision: 945 URL: http://tracker.coreboot.org/trac/openbios/changeset/945 Log: ppc: Avoid vector overlap on ppc64 Due to the 64-bit immediate load sequence, the ISI and DSI vectors are two instructions too long for the respective segment exceptions. Move the code to the start of the relocated vector region and do a relative branch there. v2: * load() -> LOAD_REG_IMMEDIATE() Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Acked-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/arch/ppc/qemu/start.S Modified: trunk/openbios-devel/arch/ppc/qemu/start.S ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/start.S Tue Nov 2 23:13:24 2010 (r944) +++ trunk/openbios-devel/arch/ppc/qemu/start.S Tue Nov 2 23:16:32 2010 (r945) @@ -186,6 +186,18 @@ 1: nop // b 1b +call_dsi_exception: + LOAD_REG_IMMEDIATE(r3, dsi_exception) + mtctr r3 + bctrl + b exception_return + +call_isi_exception: + LOAD_REG_IMMEDIATE(r3, isi_exception) + mtctr r3 + bctrl + b exception_return + exception_return: EXCEPTION_EPILOGUE @@ -202,17 +214,15 @@ VECTOR( 0x300, "DSI" ): EXCEPTION_PREAMBLE - LOAD_REG_IMMEDIATE(r3, dsi_exception) - mtctr r3 - bctrl - b exception_return + b call_dsi_exception + +ILLEGAL_VECTOR( 0x380 ) VECTOR( 0x400, "ISI" ): EXCEPTION_PREAMBLE - LOAD_REG_IMMEDIATE(r3, isi_exception) - mtctr r3 - bctrl - b exception_return + b call_isi_exception + +ILLEGAL_VECTOR( 0x480 ) ILLEGAL_VECTOR( 0x500 ) ILLEGAL_VECTOR( 0x600 )

1 0

[commit] r944 - in trunk/openbios-devel: arch/ppc/qemu include/arch/ppc
by repository service 02 Nov '10

02 Nov '10

Author: afaerber Date: Tue Nov 2 23:13:24 2010 New Revision: 944 URL: http://tracker.coreboot.org/trac/openbios/changeset/944 Log: ppc: Introduce LOAD_REG_IMMEDIATE() macro for ppc64 When loading the fw_cfg address with just lis, addi sequence, we get the high address bits as 0xffffffff on ppc64. Use the full double word immediate load sequence on ppc64. v2: * Rename from load() to LOAD_REG_IMMEDIATE() to match Linux. Suggested by Alex. * Move to ppc/asmdefs.h for future use elsewhere. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Acked-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/arch/ppc/qemu/start.S trunk/openbios-devel/include/arch/ppc/asmdefs.h Modified: trunk/openbios-devel/arch/ppc/qemu/start.S ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/start.S Tue Nov 2 23:09:31 2010 (r943) +++ trunk/openbios-devel/arch/ppc/qemu/start.S Tue Nov 2 23:13:24 2010 (r944) @@ -202,16 +202,14 @@ VECTOR( 0x300, "DSI" ): EXCEPTION_PREAMBLE - lis r3,HA(dsi_exception) - addi r3,r3,LO(dsi_exception) + LOAD_REG_IMMEDIATE(r3, dsi_exception) mtctr r3 bctrl b exception_return VECTOR( 0x400, "ISI" ): EXCEPTION_PREAMBLE - lis r3,HA(isi_exception) - addi r3,r3,LO(isi_exception) + LOAD_REG_IMMEDIATE(r3, isi_exception) mtctr r3 bctrl b exception_return @@ -247,16 +245,14 @@ VECTOR( 0x2000, "DSI_64" ): EXCEPTION_PREAMBLE_64 - lis r3,HA(dsi_exception) - addi r3,r3,LO(dsi_exception) + LOAD_REG_IMMEDIATE(r3, dsi_exception) mtctr r3 bctrl EXCEPTION_EPILOGUE_64 VECTOR( 0x2200, "ISI_64" ): EXCEPTION_PREAMBLE_64 - lis r3,HA(isi_exception) - addi r3,r3,LO(isi_exception) + LOAD_REG_IMMEDIATE(r3, isi_exception) mtctr r3 bctrl EXCEPTION_EPILOGUE_64 @@ -278,8 +274,7 @@ /* copy exception vectors */ - lis r3,HA(__vectors) - addi r3,r3,LO(__vectors) + LOAD_REG_IMMEDIATE(r3, __vectors) li r4,0 li r5,__vectors_end - __vectors + 16 rlwinm r5,r5,0,0,28 @@ -378,22 +373,19 @@ stwu r1,-16(r1) stw r0,20(r1) mtlr r5 - lis r8,HA(saved_stack) - addi r8,r8,LO(saved_stack) // save our stack pointer + LOAD_REG_IMMEDIATE(r8, saved_stack) // save our stack pointer stw r1,0(r8) mfsdr1 r1 addi r1, r1, -32768 /* - 32 KiB exception stack */ addis r1, r1, -1 /* - 64 KiB stack */ - lis r5,HA(of_client_callback) - addi r5,r5,LO(of_client_callback) // r5 = callback + LOAD_REG_IMMEDIATE(r5, of_client_callback) // r5 = callback li r6,0 // r6 = address of client program arguments (unused) li r7,0 // r7 = length of client program arguments (unused) li r0,MSR_FP | MSR_ME | MSR_DR | MSR_IR mtmsr r0 blrl - lis r8,HA(saved_stack) - addi r8,r8,LO(saved_stack) // restore stack pointer + LOAD_REG_IMMEDIATE(r8, saved_stack) // restore stack pointer mr r1,r8 lwz r0,20(r1) mtlr r0 @@ -418,8 +410,7 @@ /* restore OF stack */ - lis r4,HA(saved_stack) - addi r4,r4,LO(saved_stack) + LOAD_REG_IMMEDIATE(r4, saved_stack) lwz r4,0(r4) stwu r4,-SAVE_SPACE(r4) @@ -564,12 +555,10 @@ #define FW_CFG_RAM_SIZE 0x03 compute_ramsize: - lis r9,HA(CFG_ADDR) - ori r9,r9,LO(CFG_ADDR) + LOAD_REG_IMMEDIATE(r9, CFG_ADDR) li r0,FW_CFG_RAM_SIZE sth r0,0(r9) - lis r9,HA(CFG_ADDR + 2) - ori r9,r9,LO(CFG_ADDR + 2) + LOAD_REG_IMMEDIATE(r9, CFG_ADDR + 2) lbz r1,0(r9) lbz r0,0(r9) slwi r0,r0,8 Modified: trunk/openbios-devel/include/arch/ppc/asmdefs.h ============================================================================== --- trunk/openbios-devel/include/arch/ppc/asmdefs.h Tue Nov 2 23:09:31 2010 (r943) +++ trunk/openbios-devel/include/arch/ppc/asmdefs.h Tue Nov 2 23:13:24 2010 (r944) @@ -75,6 +75,19 @@ /* MISC */ /************************************************************************/ +#ifdef __powerpc64__ +#define LOAD_REG_IMMEDIATE(D, x) \ + lis (D), (x)@highest ; \ + ori (D), (D), (x)@higher ; \ + sldi (D), (D), 32 ; \ + oris (D), (D), (x)@h ; \ + ori (D), (D), (x)@l +#else +#define LOAD_REG_IMMEDIATE(D, x) \ + lis (D), HA(x) ; \ + addi (D), (D), LO(x) +#endif + #ifndef __darwin__ #define GLOBL( name ) .globl name ; name #define EXTERN( name ) name

1 0

[commit] r943 - trunk/openbios-devel/arch/ppc/qemu
by repository service 02 Nov '10

02 Nov '10

Author: afaerber Date: Tue Nov 2 23:09:31 2010 New Revision: 943 URL: http://tracker.coreboot.org/trac/openbios/changeset/943 Log: ppc64: Don't disable SF bit Don't clear the MSR for the pure ppc64 version since it would disable Sixty Four bit mode as well. The MMU is supposed to be disabled by default. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Acked-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/arch/ppc/qemu/start.S Modified: trunk/openbios-devel/arch/ppc/qemu/start.S ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/start.S Tue Nov 2 23:07:27 2010 (r942) +++ trunk/openbios-devel/arch/ppc/qemu/start.S Tue Nov 2 23:09:31 2010 (r943) @@ -268,10 +268,13 @@ /************************************************************************/ GLOBL(_entry): + +#ifndef __powerpc64__ /* clear MSR, disable MMU */ li r0,0 mtmsr r0 +#endif /* copy exception vectors */

1 0

[commit] r942 - trunk/openbios-devel/arch/ppc/qemu
by repository service 02 Nov '10

02 Nov '10

Author: afaerber Date: Tue Nov 2 23:07:27 2010 New Revision: 942 URL: http://tracker.coreboot.org/trac/openbios/changeset/942 Log: ppc: Use vector-local version of exception_return On ppc64 the high 32 address bits are clear, so ba's sign extension cannot be used to branch to the ROM version of exception_return. Use a relative branch to the relocated version instead. This fixes relocation linker errors for ppc64. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Acked-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/arch/ppc/qemu/start.S Modified: trunk/openbios-devel/arch/ppc/qemu/start.S ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/start.S Mon Nov 1 18:31:11 2010 (r941) +++ trunk/openbios-devel/arch/ppc/qemu/start.S Tue Nov 2 23:07:27 2010 (r942) @@ -206,7 +206,7 @@ addi r3,r3,LO(dsi_exception) mtctr r3 bctrl - ba exception_return + b exception_return VECTOR( 0x400, "ISI" ): EXCEPTION_PREAMBLE @@ -214,7 +214,7 @@ addi r3,r3,LO(isi_exception) mtctr r3 bctrl - ba exception_return + b exception_return ILLEGAL_VECTOR( 0x500 ) ILLEGAL_VECTOR( 0x600 )

1 0

SOLVED: the mystery of Solaris on SPARC32 and the missing Forth arguments
by Mark Cave-Ayland 02 Nov '10

02 Nov '10

Hi folks, So I thought it may be interesting over the weekend to take a look and see how Solaris on SPARC32 is looking at the moment, and found that I was getting about as far as Artyom was, i.e. ufsboot dies after emitting this cryptic Forth statement with missing parameters: ['] find-device catch if 2drop true else current-device device-end then swap l! With gdb primed with a breakpoint set at obp_fortheval_v2() I was able to poke around and see what was happening at the time the call into OpenBIOS was being made. Nothing interesting there. But jumping back a frame showed some extra information being set in the o registers: (gdb) bt #0 obp_fortheval_v2 (str=0x1190d0 " ['] find-device catch if 2drop true else current-device device-end then swap l!") at ../arch/sparc32/romvec.c:424 #1 0x00113dd4 in ?? () #2 0x00113dd4 in ?? () Backtrace stopped: previous frame identical to this frame (corrupt stack?) (gdb) frame 1 #1 0x00113dd4 in ?? () (gdb) info regi ... o0 0x1190d0 1151184 o1 0x49 73 o2 0x1335c0 1258944 o3 0x130794 1247124 o4 0x0 0 o5 0x0 0 ... Okay; so let's take a look at what's in these o registers: (gdb) x/1s 0x1190d0 0x1190d0: " ['] find-device catch if 2drop true else current-device device-end then swap l!" (gdb) x/1s 0x1335c0 0x1335c0: "/iommu@0,10000000/sbus@0,10001000/espdma@5,8400000/esp@5,8800000/sd@2,0:d" (gdb) x/4xb 0x130794 0x130794: 0xff 0xff 0xff 0xff (gdb) Bingo! The missing parameters! Stepping back to just before where the code is invoked, I see this: 0x00113dac: sethi %hi(0x118c00), %g2 0x00113db0: mov %i0, %o0 0x00113db4: ld [ %g2 + 0xa0 ], %g2 0x00113db8: mov %l2, %o1 0x00113dbc: mov %l1, %o2 0x00113dc0: mov %i2, %o3 0x00113dc4: mov %i4, %o4 0x00113dc8: ld [ %g2 + 0x7c ], %l0 0x00113dcc: call %l0 0x00113dd0: mov %i5, %o5 So this makes it appear as if %o0 to %o5 are all set in preparation for the romvec call. Now minus the actual Forth string (actually a cstr), if the other values were pushed onto the stack in reverse order then it appears that this code would it is supposed to. There is one Forth call in the traces that only takes 1 parameter, but there doesn't seem to be a way of passing the number of arguments into the romvec call. However, based on looking at the traces, starting with the first non-zero value in the highest o register and then pushing all the lower o register values onto the Forth stack before execution should give the correct result. On the basis of this, I'd like to suggest the following proposal: 1) Change the signature of obp_fortheval_v2() from: static void obp_fortheval_v2(char *str) to: static void obp_fortheval_v2(char *str, int arg0, int arg1, int arg2, int arg3, int arg4) 2) Add code to obp_fortheval_v2 that starting from arg4 and working down to arg0, finds the first non-zero value and then pushes all remaining values argN down to arg0 onto the Forth stack before executing the Forth string. Does this sound reasonable? I'm surprised that one else has realised that the obp_fortheval_v2 function signature was wrong, but I guess it probably hardly gets used for anything these days. As a separate hack, the equivalent of the OpenBOOT current-device word in OpenBIOS is active-package. So we should probably create an OpenBIOS variable called current-device too, and set its value to -1 when the function is entered. Then after all Forth has been evaluated, if it's value has changed from before the Forth call was made then set active-package to the new value before exit. ATB, Mark. -- Mark Cave-Ayland - Senior Technical Architect PostgreSQL - PostGIS Sirius Corporation plc - control through freedom http://www.siriusit.co.uk t: +44 870 608 0063 Sirius Labs: http://www.siriusit.co.uk/labs

6 46

[commit] r941 - trunk/openbios-devel/arch/ppc/qemu
by repository service 01 Nov '10

01 Nov '10

Author: afaerber Date: Mon Nov 1 18:31:11 2010 New Revision: 941 URL: http://tracker.coreboot.org/trac/openbios/changeset/941 Log: ppc: Label illegal vectors Improve GDB backtrace by making the vector source less ambiguous. A 0x700 program exception was shown as originating from vector__0x400. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/arch/ppc/qemu/start.S Modified: trunk/openbios-devel/arch/ppc/qemu/start.S ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/start.S Sun Oct 31 17:54:58 2010 (r940) +++ trunk/openbios-devel/arch/ppc/qemu/start.S Mon Nov 1 18:31:11 2010 (r941) @@ -21,7 +21,7 @@ /* Macros */ /************************************************************************/ -#define ILLEGAL_VECTOR( v ) .org __vectors + v ; bl trap_error ; +#define ILLEGAL_VECTOR( v ) .org __vectors + v ; vector__##v: bl trap_error ; #define VECTOR( v, dummystr ) .org __vectors + v ; vector__##v /* We're trying to use the same code for the ppc32 and ppc64 handlers here.

1 0

couple of problem while compiling and running openfirmware on qemu
by Gleb Natapov 01 Nov '10

01 Nov '10

Hello, I tried to compile openfirmware for qemu like described here http://www.openfirmware.info/Building_OFW_for_QEMU. But after running make in cpu/x86/pc/emu/build on 64bit host I get linkage error: ld -T inflate.ld inflate.lo -o inflate.o ld: i386 architecture of input file `inflate.lo' is incompatible with i386:x86-64 output After applying this patch: Index: cpu/x86/Linux/Makefile =================================================================== --- cpu/x86/Linux/Makefile (revision 1996) +++ cpu/x86/Linux/Makefile (working copy) @@ -34,7 +34,7 @@ ${CC} -c -m32 -Wall -fno-stack-protector -ffreestanding -D_FORTIFY_SOURCE=0 -DNEED_BCOPY -O3 -fpic $< -o $@ inflate.o: inflate.lo - ${LD} -T inflate.ld $< -o $@ + ${LD} -melf_i386 -T inflate.ld $< -o $@ ../build/inflate.bin: inflate.o objcopy -O binary $< $@ ==== compilation goes a little bit further but now it stops with: ./build emuofw.rom --- Rebuilding ohci.fc --- Cmd: ${HOSTDIR}/forth ${HOSTDIR}/../build/builder.dic ../ohci.bth ${BP}/dev/usb2/hcd/ohci/ohci.fth:25: my-w@ ? don't know much forth so just commented every line that gave me an error: Index: dev/usb2/hcd/ohci/ohci.fth =================================================================== --- dev/usb2/hcd/ohci/ohci.fth (revision 1996) +++ dev/usb2/hcd/ohci/ohci.fth (working copy) @@ -22,12 +22,12 @@ 0 value ohci-reg : map-regs ( -- ) - 4 my-w@ h# 16 or 4 my-w! - 0 0 my-space h# 0200.0010 + 1000 map-in to ohci-reg +\ 4 my-w@ h# 16 or 4 my-w! +\ 0 0 my-space h# 0200.0010 + 1000 map-in to ohci-reg ; : unmap-regs ( -- ) - ohci-reg 1000 map-out 0 to ohci-reg +\ ohci-reg 1000 map-out 0 to ohci-reg ; : ohci-reg@ ( idx -- data ) ohci-reg + rl@ ; ======== After that compilation finally succeeded. Produced rom image runs fine on qemu, but fails on qemu-kvm with error: BUG: kvm_dirty_pages_log_change: invalid parameters 0000000010000000-0000000010ffffff Looking into it it seams like openfirmware configure cirrus framebuffer to be at address 0x10000000, but later it configures nic memory BAR with the same address (during device enumeration perhaps). Later it deconfigures nic again. Qemu somehow handles this fine, but qemu-kvm doesn't. This shouldn't work on real HW too FWIW. -- Gleb.

1 0

[commit] r940 - trunk/openbios-devel/kernel
by repository service 31 Oct '10

31 Oct '10

Author: afaerber Date: Sun Oct 31 17:54:58 2010 New Revision: 940 URL: http://tracker.coreboot.org/trac/openbios/changeset/940 Log: Consolidate cell format defines When cross-compiling ppc64 from ppc (native larger than host), %llx cell format leads to warnings. The cell format depends solely on the cell type definition, not on pointer sizes. Under the present assumption that native smaller than host bitwidth occurs when cross-compiling a 32-bit target from 64-bit host, we can reuse the definitions from the equality path for all bitwidths. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/kernel/cross.h Modified: trunk/openbios-devel/kernel/cross.h ============================================================================== --- trunk/openbios-devel/kernel/cross.h Sun Oct 31 17:37:33 2010 (r939) +++ trunk/openbios-devel/kernel/cross.h Sun Oct 31 17:54:58 2010 (r940) @@ -102,7 +102,6 @@ /* bit width handling */ -#ifdef NATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH #if BITS==32 #define FMT_CELL_x "x" #define FMT_CELL_d "d" @@ -110,21 +109,16 @@ #define FMT_CELL_x "llx" #define FMT_CELL_d "lld" #endif -#endif #ifdef NATIVE_BITWIDTH_SMALLER_THAN_HOST_BITWIDTH extern unsigned long base_address; #define pointer2cell(x) ((ucell)(((unsigned long)(x))-base_address)) #define cell2pointer(x) ((u8 *)(((unsigned long)(x))+base_address)) -#define FMT_CELL_x "x" -#define FMT_CELL_d "d" #endif #ifdef NATIVE_BITWIDTH_LARGER_THAN_HOST_BITWIDTH #define pointer2cell(x) ((ucell)(unsigned long)(x)) #define cell2pointer(x) ((u8 *)((unsigned long)(x)&0xFFFFFFFFUL)) -#define FMT_CELL_x "llx" -#define FMT_CELL_d "lld" #endif #endif

2 1

[commit] r939 - in trunk/openbios-devel: include/kernel kernel
by repository service 31 Oct '10

31 Oct '10

Author: afaerber Date: Sun Oct 31 17:37:33 2010 New Revision: 939 URL: http://tracker.coreboot.org/trac/openbios/changeset/939 Log: Partially revert r917: Leave bootstrap functionality in kernel/cross.h The base_address for native bitwidth smaller than host bitwidth is available only in kernel/bootstrap.c and thus cannot be used elsewhere. The bitwidth equality code path will have to be enhanced for different cell sizes instead. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/include/kernel/stack.h trunk/openbios-devel/kernel/cross.h Modified: trunk/openbios-devel/include/kernel/stack.h ============================================================================== --- trunk/openbios-devel/include/kernel/stack.h Sun Oct 31 16:12:01 2010 (r938) +++ trunk/openbios-devel/include/kernel/stack.h Sun Oct 31 17:37:33 2010 (r939) @@ -35,14 +35,6 @@ #define pointer2cell(x) ((ucell)(uintptr_t)(x)) #define cell2pointer(x) ((u8 *)(uintptr_t)(x)) #endif -#ifdef NATIVE_BITWIDTH_SMALLER_THAN_HOST_BITWIDTH -#define pointer2cell(x) ((ucell)(((unsigned long)(x))-base_address)) -#define cell2pointer(x) ((u8 *)(((unsigned long)(x))+base_address)) -#endif -#ifdef NATIVE_BITWIDTH_LARGER_THAN_HOST_BITWIDTH -#define pointer2cell(x) ((ucell)(unsigned long)(x)) -#define cell2pointer(x) ((u8 *)((unsigned long)(x)&0xFFFFFFFFUL)) -#endif static inline void PUSH(ucell value) { dstack[++dstackcnt] = (value); Modified: trunk/openbios-devel/kernel/cross.h ============================================================================== --- trunk/openbios-devel/kernel/cross.h Sun Oct 31 16:12:01 2010 (r938) +++ trunk/openbios-devel/kernel/cross.h Sun Oct 31 17:37:33 2010 (r939) @@ -114,11 +114,15 @@ #ifdef NATIVE_BITWIDTH_SMALLER_THAN_HOST_BITWIDTH extern unsigned long base_address; +#define pointer2cell(x) ((ucell)(((unsigned long)(x))-base_address)) +#define cell2pointer(x) ((u8 *)(((unsigned long)(x))+base_address)) #define FMT_CELL_x "x" #define FMT_CELL_d "d" #endif #ifdef NATIVE_BITWIDTH_LARGER_THAN_HOST_BITWIDTH +#define pointer2cell(x) ((ucell)(unsigned long)(x)) +#define cell2pointer(x) ((u8 *)((unsigned long)(x)&0xFFFFFFFFUL)) #define FMT_CELL_x "llx" #define FMT_CELL_d "lld" #endif

1 0

[PATCH] ofmem: CIF release preparations
by Andreas Färber 31 Oct '10

31 Oct '10

Add an ofmem_release() function and stub out the implementation. Hook it up for ppc and sparc64. Cc: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> --- Hello Mark, Would you be okay with me applying this as an intermediate step? I got lost in the logic of remove_range() at some point and won't get around to looking into this so soon. BR, Andreas arch/ppc/qemu/methods.c | 5 +++-- arch/sparc64/lib.c | 5 +++-- include/libopenbios/ofmem.h | 1 + libopenbios/ofmem_common.c | 28 ++++++++++++++++++++++++++-- 4 files changed, 33 insertions(+), 6 deletions(-) diff --git a/arch/ppc/qemu/methods.c b/arch/ppc/qemu/methods.c index 12424e9..8219cff 100644 --- a/arch/ppc/qemu/methods.c +++ b/arch/ppc/qemu/methods.c @@ -271,8 +271,9 @@ ciface_claim( void ) static void ciface_release( void ) { - POP(); - POP(); + ucell size = POP(); + ucell virt = POP(); + ofmem_release(virt, size); } diff --git a/arch/sparc64/lib.c b/arch/sparc64/lib.c index 874badb..03dc754 100644 --- a/arch/sparc64/lib.c +++ b/arch/sparc64/lib.c @@ -584,8 +584,9 @@ ciface_claim( void ) static void ciface_release( void ) { - POP(); - POP(); + ucell size = POP(); + ucell virt = POP(); + ofmem_release(virt, size); } DECLARE_NODE(memory, INSTALL_OPEN, 0, "/memory"); diff --git a/include/libopenbios/ofmem.h b/include/libopenbios/ofmem.h index 0bd63a3..74f1efd 100644 --- a/include/libopenbios/ofmem.h +++ b/include/libopenbios/ofmem.h @@ -101,6 +101,7 @@ extern ucell ofmem_retain( ucell phys, ucell size, ucell align ); extern int ofmem_map( ucell phys, ucell virt, ucell size, ucell mode ); extern int ofmem_unmap( ucell virt, ucell size ); +extern void ofmem_release( ucell virt, ucell size ); extern void ofmem_release_phys( ucell phys, ucell size ); extern void ofmem_release_virt( ucell virt, ucell size ); extern ucell ofmem_translate( ucell virt, ucell *ret_mode ); diff --git a/libopenbios/ofmem_common.c b/libopenbios/ofmem_common.c index 22b268d..64695b6 100644 --- a/libopenbios/ofmem_common.c +++ b/libopenbios/ofmem_common.c @@ -770,13 +770,19 @@ ucell ofmem_translate( ucell virt, ucell *mode ) return -1; } +static void remove_range( ucell ea, ucell size, range_t **r ) +{ + OFMEM_TRACE("%s: not implemented\n", __func__); +} + /* release memory allocated by ofmem_claim_phys */ void ofmem_release_phys( ucell phys, ucell size ) { OFMEM_TRACE("ofmem_release_phys addr=" FMT_ucellx " size=" FMT_ucellx "\n", phys, size); - OFMEM_TRACE("ofmem_release_phys not implemented"); + ofmem_t *ofmem = ofmem_arch_get_private(); + remove_range(phys, size, &ofmem->phys_range); } /* release memory allocated by ofmem_claim_virt */ @@ -785,7 +791,25 @@ void ofmem_release_virt( ucell virt, ucell size ) OFMEM_TRACE("ofmem_release_virt addr=" FMT_ucellx " size=" FMT_ucellx "\n", virt, size); - OFMEM_TRACE("ofmem_release_virt not implemented"); + ofmem_t *ofmem = ofmem_arch_get_private(); + remove_range(virt, size, &ofmem->virt_range); +} + +/* release memory allocated by ofmem_claim - 6.3.2.4 */ +void ofmem_release( ucell virt, ucell size ) +{ + OFMEM_TRACE("%s addr=" FMT_ucellx " size=" FMT_ucellx "\n", + __func__, virt, size); + + ucell mode; + ucell phys = ofmem_translate(virt, &mode); + if (phys == (ucell)-1) { + OFMEM_TRACE("%s: no mapping\n", __func__); + return; + } + ofmem_unmap(virt, size); + ofmem_release_virt(virt, size); + ofmem_release_phys(phys, size); } /************************************************************************/ -- 1.7.3

2 2

[commit] r938 - in trunk/openbios-devel: arch/ppc/qemu arch/sparc64 include/libopenbios libopenbios
by repository service 31 Oct '10

31 Oct '10

Author: afaerber Date: Sun Oct 31 16:12:01 2010 New Revision: 938 URL: http://tracker.coreboot.org/trac/openbios/changeset/938 Log: ofmem: CIF release preparations Add an ofmem_release() function and stub out the implementation. Hook it up for ppc and sparc64. Cc: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/arch/ppc/qemu/methods.c trunk/openbios-devel/arch/sparc64/lib.c trunk/openbios-devel/include/libopenbios/ofmem.h trunk/openbios-devel/libopenbios/ofmem_common.c Modified: trunk/openbios-devel/arch/ppc/qemu/methods.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/methods.c Sun Oct 31 11:30:22 2010 (r937) +++ trunk/openbios-devel/arch/ppc/qemu/methods.c Sun Oct 31 16:12:01 2010 (r938) @@ -271,8 +271,9 @@ static void ciface_release( void ) { - POP(); - POP(); + ucell size = POP(); + ucell virt = POP(); + ofmem_release(virt, size); } Modified: trunk/openbios-devel/arch/sparc64/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/lib.c Sun Oct 31 11:30:22 2010 (r937) +++ trunk/openbios-devel/arch/sparc64/lib.c Sun Oct 31 16:12:01 2010 (r938) @@ -584,8 +584,9 @@ static void ciface_release( void ) { - POP(); - POP(); + ucell size = POP(); + ucell virt = POP(); + ofmem_release(virt, size); } DECLARE_NODE(memory, INSTALL_OPEN, 0, "/memory"); Modified: trunk/openbios-devel/include/libopenbios/ofmem.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/ofmem.h Sun Oct 31 11:30:22 2010 (r937) +++ trunk/openbios-devel/include/libopenbios/ofmem.h Sun Oct 31 16:12:01 2010 (r938) @@ -101,6 +101,7 @@ extern int ofmem_map( ucell phys, ucell virt, ucell size, ucell mode ); extern int ofmem_unmap( ucell virt, ucell size ); +extern void ofmem_release( ucell virt, ucell size ); extern void ofmem_release_phys( ucell phys, ucell size ); extern void ofmem_release_virt( ucell virt, ucell size ); extern ucell ofmem_translate( ucell virt, ucell *ret_mode ); Modified: trunk/openbios-devel/libopenbios/ofmem_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/ofmem_common.c Sun Oct 31 11:30:22 2010 (r937) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Sun Oct 31 16:12:01 2010 (r938) @@ -770,13 +770,19 @@ return -1; } +static void remove_range( ucell ea, ucell size, range_t **r ) +{ + OFMEM_TRACE("%s: not implemented\n", __func__); +} + /* release memory allocated by ofmem_claim_phys */ void ofmem_release_phys( ucell phys, ucell size ) { OFMEM_TRACE("ofmem_release_phys addr=" FMT_ucellx " size=" FMT_ucellx "\n", phys, size); - OFMEM_TRACE("ofmem_release_phys not implemented"); + ofmem_t *ofmem = ofmem_arch_get_private(); + remove_range(phys, size, &ofmem->phys_range); } /* release memory allocated by ofmem_claim_virt */ @@ -785,7 +791,25 @@ OFMEM_TRACE("ofmem_release_virt addr=" FMT_ucellx " size=" FMT_ucellx "\n", virt, size); - OFMEM_TRACE("ofmem_release_virt not implemented"); + ofmem_t *ofmem = ofmem_arch_get_private(); + remove_range(virt, size, &ofmem->virt_range); +} + +/* release memory allocated by ofmem_claim - 6.3.2.4 */ +void ofmem_release( ucell virt, ucell size ) +{ + OFMEM_TRACE("%s addr=" FMT_ucellx " size=" FMT_ucellx "\n", + __func__, virt, size); + + ucell mode; + ucell phys = ofmem_translate(virt, &mode); + if (phys == (ucell)-1) { + OFMEM_TRACE("%s: no mapping\n", __func__); + return; + } + ofmem_unmap(virt, size); + ofmem_release_virt(virt, size); + ofmem_release_phys(phys, size); } /************************************************************************/

1 0