coreboot June 2007

coreboot@coreboot.org

76 participants
285 discussions

[LinuxBIOS] [PATCH] v3: Drop util/dtc/newstatic.c
by Uwe Hermann 30 Jun '07

30 Jun '07

See patch. Uwe. -- http://www.hermann-uwe.de | http://www.holsham-traders.de http://www.crazy-hacks.org | http://www.unmaintained-free-software.org

2 2

[LinuxBIOS] r422 - LinuxBIOSv3/util/dtc
by svn＠openbios.org 30 Jun '07

30 Jun '07

Author: uwe Date: 2007-06-30 18:55:16 +0200 (Sat, 30 Jun 2007) New Revision: 422 Removed: LinuxBIOSv3/util/dtc/newstatic.c Log: Drop util/dtc/newstatic.c as it seems to be unused, the build works just fine without it. Probably was a test file only (?) Signed-off-by: Uwe Hermann <uwe(a)hermann-uwe.de> Acked-by: Ronald G. Minnich <rminnich(a)gmail.com> Deleted: LinuxBIOSv3/util/dtc/newstatic.c =================================================================== --- LinuxBIOSv3/util/dtc/newstatic.c 2007-06-29 22:15:24 UTC (rev 421) +++ LinuxBIOSv3/util/dtc/newstatic.c 2007-06-30 16:55:16 UTC (rev 422) @@ -1,116 +0,0 @@ -struct root { - u32 model; - u32 Haddress_cells; - u32 Hsize_cells; - u32 compatible; -}; /*root*/ -struct cpus { - u32 Haddress_cells; - u32 Hsize_cells; -}; /*cpus*/ -struct emulation_qemu_i386 { - u32 name; - u32 device_type; - u32 clock_frequency; - u32 timebase_frequency; - u32 linux_boot_cpu; - u32 reg; - u32 i_cache_size; - u32 d_cache_size; - u32 linux_phandle; -}; /*emulation_qemu_i386*/ -struct memory { - u32 device_type; - u32 reg; -}; /*memory*/ -struct northbridge_intel_440bx { - u32 associated_cpu; -}; /*northbridge_intel_440bx*/ -struct southbridge_intel_piix4 { -}; /*southbridge_intel_piix4*/ -struct superio_nsc_sucks { -}; /*superio_nsc_sucks*/ -struct uart { - u32 enabled; -}; /*uart*/ -struct chosen { - u32 bootargs; - u32 linux_platform; - u32 linux_stdout_path; -}; /*chosen*/ -struct options { - u32 normal; - u32 fallback; -}; /*options*/ -struct root root = { - u8 model = {71,65,6d,75,00,}; - u8 Haddress_cells = {00,00,00,01,}; - u8 Hsize_cells = {00,00,00,01,}; - u8 compatible = {65,6d,75,6c,61,74,69,6f,6e,2d,69,33,38,36,2c,71,65,6d,75,00,}; -}; /*root*/ -struct device dev_root = { - .children = dev_cpus -} -struct cpus cpus = { - u8 Haddress_cells = {00,00,00,01,}; - u8 Hsize_cells = {00,00,00,00,}; -}; /*cpus*/ -struct device dev_cpus = { - .sibling = dev_memory_0 - .children = dev_emulation_qemu_i386_0 -} -struct emulation_qemu_i386 emulation_qemu_i386_0 = { - u8 name = {65,6d,75,6c,61,74,69,6f,6e,2c,71,65,6d,75,2d,69,33,38,36,00,}; - u8 device_type = {63,70,75,00,}; - u8 clock_frequency = {5f,5e,10,00,}; - u8 timebase_frequency = {01,fffffffc,ffffffa0,55,}; - u8 reg = {00,00,00,00,}; - u8 i_cache_size = {00,00,20,00,}; - u8 d_cache_size = {00,00,20,00,}; - u8 linux_phandle = {00,00,00,01,}; -}; /*emulation_qemu_i386_0*/ -struct device dev_emulation_qemu_i386_0 = { -} -struct memory memory_0 = { - u8 device_type = {6d,65,6d,6f,72,79,00,}; - u8 reg = {00,00,00,00,20,00,00,00,}; -}; /*memory_0*/ -struct device dev_memory_0 = { - .sibling = dev_northbridge_intel_440bx -} -struct northbridge_intel_440bx northbridge_intel_440bx = { - u8 associated_cpu = {00,00,00,01,}; -}; /*northbridge_intel_440bx*/ -struct device dev_northbridge_intel_440bx = { - .sibling = dev_chosen - .children = dev_southbridge_intel_piix4 -} -struct southbridge_intel_piix4 southbridge_intel_piix4 = { -}; /*southbridge_intel_piix4*/ -struct device dev_southbridge_intel_piix4 = { - .children = dev_superio_nsc_sucks -} -struct superio_nsc_sucks superio_nsc_sucks = { -}; /*superio_nsc_sucks*/ -struct device dev_superio_nsc_sucks = { - .children = dev_uart_0 -} -struct uart uart_0 = { - u8 enabled = {00,00,00,01,}; -}; /*uart_0*/ -struct device dev_uart_0 = { -} -struct chosen chosen = { - u8 bootargs = {72,6f,6f,74,3d,2f,64,65,76,2f,73,64,61,32,00,}; - u8 linux_platform = {00,00,06,00,}; - u8 linux_stdout_path = {2f,64,65,76,2f,74,74,79,53,30,00,}; -}; /*chosen*/ -struct device dev_chosen = { - .sibling = dev_options -} -struct options options = { - u8 normal = {6e,6f,72,6d,61,6c,00,}; - u8 fallback = {66,61,6c,6c,62,61,63,6b,00,}; -}; /*options*/ -struct device dev_options = { -}

1 0

[LinuxBIOS] [PATCH] v3 drop malloc, clean up device model
by Stefan Reinauer 30 Jun '07

30 Jun '07

* start using arch/foo.h again instead of archfoo.h (trivial) * make constructor an initializer. * fix memory leak/code flow error in current code * add spinlocking * drop malloc and use new_device for device allocation instead. * ad CONFIG_SMP as it is needed by spinlocks and soon other stuff. tested in qemu and works. Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> -- coresystems GmbH • Brahmsstr. 16 • D-79104 Freiburg i. Br. Tel.: +49 761 7668825 • Fax: +49 761 7664613 Email: info(a)coresystems.de • http://www.coresystems.de/

3 4

[LinuxBIOS] r421 - in LinuxBIOSv3: arch/x86 lib
by svn＠openbios.org 30 Jun '07

30 Jun '07

Author: stepan Date: 2007-06-30 00:15:24 +0200 (Sat, 30 Jun 2007) New Revision: 421 Modified: LinuxBIOSv3/arch/x86/stage1.c LinuxBIOSv3/lib/lar.c Log: fix lar code to return 1 when the file is not found. (trivial) Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: LinuxBIOSv3/arch/x86/stage1.c =================================================================== --- LinuxBIOSv3/arch/x86/stage1.c 2007-06-29 20:25:30 UTC (rev 420) +++ LinuxBIOSv3/arch/x86/stage1.c 2007-06-29 22:15:24 UTC (rev 421) @@ -101,7 +101,7 @@ // FIXME this should be defined in the VPD area // but NOT IN THE CODE. - archive.len=(CONFIG_LINUXBIOS_ROMSIZE_KB-16)*1024; + archive.len=(CONFIG_LINUXBIOS_ROMSIZE_KB)*1024; archive.start=(void *)(0UL-(CONFIG_LINUXBIOS_ROMSIZE_KB*1024)); // FIXME check integrity Modified: LinuxBIOSv3/lib/lar.c =================================================================== --- LinuxBIOSv3/lib/lar.c 2007-06-29 20:25:30 UTC (rev 420) +++ LinuxBIOSv3/lib/lar.c 2007-06-29 22:15:24 UTC (rev 421) @@ -40,7 +40,7 @@ archive->len); for (walk = archive->start; - walk < (char *)archive->start + archive->len - 1; walk += 16) { + (walk - 1) < (char *)(archive->start + archive->len - 1 ); walk += 16) { if (strcmp(walk, MAGIC) != 0) continue;

1 0

[LinuxBIOS] r420 - LinuxBIOSv3/include
by svn＠openbios.org 29 Jun '07

29 Jun '07

Author: stepan Date: 2007-06-29 22:25:30 +0200 (Fri, 29 Jun 2007) New Revision: 420 Added: LinuxBIOSv3/include/spinlock.h Log: oops. forgot this. Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Added: LinuxBIOSv3/include/spinlock.h =================================================================== --- LinuxBIOSv3/include/spinlock.h (rev 0) +++ LinuxBIOSv3/include/spinlock.h 2007-06-29 20:25:30 UTC (rev 420) @@ -0,0 +1,45 @@ +/* + * This file is part of the LinuxBIOS project. + * + * Copyright (C) 2001 Linux Networx + * + * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef SPINLOCK_H +#define SPINLOCK_H + +#if defined(CONFIG_SMP) && CONFIG_SMP == 1 +#include <arch/spinlock.h> +#else /* !CONFIG_SMP */ + +/* Most GCC versions have a nasty bug with empty initializers */ +#if (__GNUC__ > 2) +typedef struct { } spinlock_t; +#define SPIN_LOCK_UNLOCKED (spinlock_t) { } +#else +typedef struct { int gcc_is_buggy; } spinlock_t; +#define SPIN_LOCK_UNLOCKED (spinlock_t) { 0 } +#endif + +#define barrier() do {} while(0) +#define spin_is_locked(lock) 0 +#define spin_unlock_wait(lock) do {} while(0) +#define spin_lock(lock) do {} while(0) +#define spin_unlock(lock) do {} while(0) +#define cpu_relax() do {} while(0) +#endif + +#endif /* SPINLOCK_H */

1 0

[LinuxBIOS] r419 - LinuxBIOSv3/util/nrv2b
by svn＠openbios.org 29 Jun '07

29 Jun '07

Author: stepan Date: 2007-06-29 20:42:32 +0200 (Fri, 29 Jun 2007) New Revision: 419 Modified: LinuxBIOSv3/util/nrv2b/Makefile LinuxBIOSv3/util/nrv2b/nrv2b.c Log: small nrv2b regression fix from Patrick Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: LinuxBIOSv3/util/nrv2b/Makefile =================================================================== --- LinuxBIOSv3/util/nrv2b/Makefile 2007-06-29 16:57:23 UTC (rev 418) +++ LinuxBIOSv3/util/nrv2b/Makefile 2007-06-29 18:42:32 UTC (rev 419) @@ -25,7 +25,7 @@ $(obj)/util/nrv2b/nrv2b-compress.o: nrv2bdir $(src)/util/nrv2b/nrv2b.c $(Q)printf " HOSTCC $(subst $(shell pwd)/,,$(@))\n" - $(Q)$(HOSTCC) $(HOSTCFLAGS) -DENCODE -DVERBOSE -DCOMPACT -DNDEBUG -DBITSIZE=32 -DENDIAN=0 -c -o $@ $(src)/util/nrv2b/nrv2b.c + $(Q)$(HOSTCC) $(HOSTCFLAGS) -DENCODE -DDECODE -DVERBOSE -DCOMPACT -DNDEBUG -DBITSIZE=32 -DENDIAN=0 -c -o $@ $(src)/util/nrv2b/nrv2b.c nrv2bdir: $(Q)printf " BUILD NRV2B\n" Modified: LinuxBIOSv3/util/nrv2b/nrv2b.c =================================================================== --- LinuxBIOSv3/util/nrv2b/nrv2b.c 2007-06-29 16:57:23 UTC (rev 418) +++ LinuxBIOSv3/util/nrv2b/nrv2b.c 2007-06-29 18:42:32 UTC (rev 419) @@ -1309,9 +1309,47 @@ out = malloc(*out_len); ucl_nrv2b_99_compress(in, in_len, out, out_len, 0 ); } +#endif +#ifdef DECODE + +#define GETBIT_8(bb, src, ilen) \ + (((bb = bb & 0x7f ? bb*2 : ((unsigned)src[ilen++]*2+1)) >> 8) & 1) + +#define GETBIT_LE16(bb, src, ilen) \ + (bb*=2,bb&0xffff ? (bb>>16)&1 : (ilen+=2,((bb=(src[ilen-2]+src[ilen-1]*256u)*2+1)>>16)&1)) + +#define GETBIT_LE32(bb, src, ilen) \ + (bc > 0 ? ((bb>>--bc)&1) : (bc=31,\ + bb=*(const uint32_t *)((src)+ilen),ilen+=4,(bb>>31)&1)) + +#if ENDIAN == 0 && BITSIZE == 8 +#define GETBIT(bb, src, ilen) GETBIT_8(bb, src, ilen) +#endif +#if ENDIAN == 0 && BITSIZE == 16 +#define GETBIT(bb, src, ilen) GETBIT_LE16(bb, src, ilen) +#endif +#if ENDIAN == 0 && BITSIZE == 32 +#define GETBIT(bb, src, ilen) GETBIT_LE32(bb, src, ilen) +#endif + +#ifndef GETBIT +#error "Bad Combination of ENDIAN and BITSIZE values specified" +#endif + +#undef SAFE + +#ifdef SAFE +#define FAIL(x,r) if (x) { Error(r); } +#else +#define FAIL(x,r) +#endif + +#ifdef COMPACT void do_nrv2b_uncompress(char* dst, char* src, unsigned long len) { unsigned long ilen = 0, olen = 0, last_m_off = 1; + uint32_t bb = 0; + unsigned bc = 0; for (;;) { unsigned int m_off, m_len; while (GETBIT(bb, src, ilen)) { @@ -1359,42 +1397,7 @@ } FAIL(ilen < src_len, "input not consumed"); } -#endif - -#ifdef DECODE - -#define GETBIT_8(bb, src, ilen) \ - (((bb = bb & 0x7f ? bb*2 : ((unsigned)src[ilen++]*2+1)) >> 8) & 1) - -#define GETBIT_LE16(bb, src, ilen) \ - (bb*=2,bb&0xffff ? (bb>>16)&1 : (ilen+=2,((bb=(src[ilen-2]+src[ilen-1]*256u)*2+1)>>16)&1)) - -#define GETBIT_LE32(bb, src, ilen) \ - (bc > 0 ? ((bb>>--bc)&1) : (bc=31,\ - bb=*(const uint32_t *)((src)+ilen),ilen+=4,(bb>>31)&1)) - -#if ENDIAN == 0 && BITSIZE == 8 -#define GETBIT(bb, src, ilen) GETBIT_8(bb, src, ilen) -#endif -#if ENDIAN == 0 && BITSIZE == 16 -#define GETBIT(bb, src, ilen) GETBIT_LE16(bb, src, ilen) -#endif -#if ENDIAN == 0 && BITSIZE == 32 -#define GETBIT(bb, src, ilen) GETBIT_LE32(bb, src, ilen) -#endif - -#ifndef GETBIT -#error "Bad Combination of ENDIAN and BITSIZE values specified" -#endif - -#undef SAFE - -#ifdef SAFE -#define FAIL(x,r) if (x) { Error(r); } #else -#define FAIL(x,r) -#endif - void Decode(void) /* recover */ { uint32_t tw; @@ -1494,6 +1497,7 @@ free(dst); } #endif +#endif #ifdef MAIN int main(int argc, char *argv[])

1 0

[LinuxBIOS] General question abouts jumps in machine code
by Shadravan Fontanov 29 Jun '07

29 Jun '07

Hello, I wanted to verify that the relative jump in my program is properly transalated into machine code. Consider following example: <code begins> extern char handler[], endhandler[]; /* C-code glue for the asm insert */ asm( ".data\n" ".code16\n" ".globl handler, endhandler\n" "\n" "handler:\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "nop\n" "jmp handler\n" "endhandler:\n" "\n" ".text\n" ".code32\n" ); int main(void) { return 0; } <code ends> There are 64 NOPs, on the basis of these I want to locate my jmp instruction after compiling. I am interested about "jmp handler\n"-instruction. I compile the example above, then start hexdump -vC compiled_example | less and look for 64 times of 0x90 (opcode for NOP). I find them: <snippet of hexdump starts> 00005740 00 00 00 00 00 00 00 00 84 e5 04 08 90 90 90 90 |................| 00005750 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 |................| 00005760 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 |................| 00005770 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 |................| 00005780 90 90 90 90 90 90 90 90 90 90 90 90 e9 bd ff 00 |................| 00005790 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| <snippet of hexdump end> Exactly 64 times 0x90, fine... The next code after the last 0x90 is 0xe9. Look at "Intel Architecture Software Developers Manual Vol2" tells: its jump instruction, the next two bytes (bd ff) specify the relative address to jump. bdff must be in second complement and represent minus 4201. But offset 4201 does not jumps to the start of the NOP sequence, it jumps to a very smaller address... Do you have any hints? Regards Shadravan --------------------------------- Be a better Globetrotter. Get better travel answers from someone who knows. Yahoo! Answers - Check it out.

3 2

[LinuxBIOS] r418 - in LinuxBIOSv3: arch/x86 device include include/arch/x86 include/arch/x86/arch include/device lib util/dtc
by svn＠openbios.org 29 Jun '07

29 Jun '07

Author: stepan Date: 2007-06-29 18:57:23 +0200 (Fri, 29 Jun 2007) New Revision: 418 Added: LinuxBIOSv3/include/arch/x86/arch/elf.h LinuxBIOSv3/include/arch/x86/arch/spinlock.h Removed: LinuxBIOSv3/include/arch/x86/archelf.h LinuxBIOSv3/include/stdlib.h LinuxBIOSv3/lib/malloc.c Modified: LinuxBIOSv3/arch/x86/Kconfig LinuxBIOSv3/arch/x86/Makefile LinuxBIOSv3/arch/x86/stage1.c LinuxBIOSv3/device/device.c LinuxBIOSv3/include/device/device.h LinuxBIOSv3/include/elf.h LinuxBIOSv3/lib/console.c LinuxBIOSv3/util/dtc/dtc-parser.y Log: * start using arch/foo.h again instead of archfoo.h (trivial) * make constructor an initializer. * fix memory leak/code flow error in current code * add spinlocking * drop malloc and use new_device for device allocation instead. * add CONFIG_SMP as it is needed by spinlocks and soon other stuff. Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Ronald G. Minnich <rminnich(a)gmail.com> Modified: LinuxBIOSv3/arch/x86/Kconfig =================================================================== --- LinuxBIOSv3/arch/x86/Kconfig 2007-06-29 15:32:19 UTC (rev 417) +++ LinuxBIOSv3/arch/x86/Kconfig 2007-06-29 16:57:23 UTC (rev 418) @@ -55,3 +55,11 @@ a battery backed up real time clock with CMOS NVRAM. It is usually set in mainboard/*/Kconfig. +config SMP + boolean + help + This option is used to enable certain functions to make + LinuxBIOS work correctly on symmetric multi processor + systems. + It is usually set in mainboard/*/Kconfig. + Modified: LinuxBIOSv3/arch/x86/Makefile =================================================================== --- LinuxBIOSv3/arch/x86/Makefile 2007-06-29 15:32:19 UTC (rev 417) +++ LinuxBIOSv3/arch/x86/Makefile 2007-06-29 16:57:23 UTC (rev 418) @@ -123,8 +123,7 @@ # TODO: This should be compressed with the default compressor. # -STAGE2_LIB_OBJ = stage2.o clog2.o mem.o malloc.o tables.o delay.o \ - compute_ip_checksum.o +STAGE2_LIB_OBJ = stage2.o clog2.o mem.o tables.o delay.o compute_ip_checksum.o STAGE2_ARCH_X86_OBJ = archtables.o linuxbios_table.o udelay_io.o STAGE2_ARCH_X86_OBJ += pci_ops_auto.o pci_ops_conf1.o pci_ops_conf2.o Modified: LinuxBIOSv3/arch/x86/stage1.c =================================================================== --- LinuxBIOSv3/arch/x86/stage1.c 2007-06-29 15:32:19 UTC (rev 417) +++ LinuxBIOSv3/arch/x86/stage1.c 2007-06-29 16:57:23 UTC (rev 418) @@ -119,12 +119,15 @@ if (ret) die("Failed RAM init code\n"); - printk(BIOS_INFO, "Done RAM init code\n"); - /* this is nasty. And, it has to be done this way. Sorry! */ - /* we have to turn off CAR, and do some other things, and it has to be done - * inline -- you can't call a function - */ + printk(BIOS_DEBUG, "Done RAM init code\n"); + + /* Turn off Cache-As-Ram, and do some other things. + * + * This has to be done inline -- You can't call a function because the + * return stack does not survive. + */ + __asm__ volatile ( /* FIXME : backup stack in CACHE_AS_RAM into mmx and sse and after we get STACK up, we restore that. Modified: LinuxBIOSv3/device/device.c =================================================================== --- LinuxBIOSv3/device/device.c 2007-06-29 15:32:19 UTC (rev 417) +++ LinuxBIOSv3/device/device.c 2007-06-29 16:57:23 UTC (rev 418) @@ -10,8 +10,9 @@ * Copyright (C) 2003 Ronald G. Minnich <rminnich(a)gmail.com> * Copyright (C) 2004-2005 Li-Ta Lo <ollie(a)lanl.gov> * Copyright (C) 2005-2006 Tyan - * (Written by Yinghai Lu <yhlu(a)tyan.com> for Tyan) + * (Written by Yinghai Lu for Tyan) * Copyright (C) 2005-2006 Stefan Reinauer <stepan(a)openbios.org> + * Copyright (C) 2007 coresystems GmbH */ /* @@ -34,10 +35,8 @@ #include <device/pci.h> #include <device/pci_ids.h> #include <string.h> -#include <stdlib.h> #include <lib.h> -#warning Do we need spinlocks in device/device.c? -//#include <smp/spinlock.h> +#include <spinlock.h> /** Linked list of all devices. */ struct device *all_devices = &dev_root; @@ -61,6 +60,34 @@ #define DEVICE_IO_START 0x1000 /** + * device memory. All the device tree wil live here + */ + +#define MAX_DEVICES 256 +static struct device devs[MAX_DEVICES]; + +/** + * The device creator. + * + * reserves a piece of memory for a device in the tree + * + * @return Pointer to the newly created device structure. + */ + +static struct device *new_device(void) +{ + static int devcnt=0; + devcnt++; + + /* Should we really die here? */ + if (devcnt>=MAX_DEVICES) { + die("Too many devices. Increase MAX_DEVICES\n"); + } + + return &devs[devcnt]; +} + +/** * Initialization tasks for the device tree code. * * At present, merely sets up last_dev_p, which used to be done by @@ -76,27 +103,17 @@ } /** - * The default constructor, which simply allocates and sets the ops pointer. + * The default constructor, which simply sets the ops pointer. * - * Allocate a new device structure and initialize device->ops. + * Initialize device->ops of a newly allocated device structure. * + * @param dev Pointer to the newly created device structure. * @param constructor A pointer to a struct constructor. - * @return Pointer to the newly created device structure. */ -struct device *default_device_constructor(struct constructor *constructor) +void default_device_constructor(struct device *dev, struct constructor *constructor) { - struct device *dev; - dev = malloc(sizeof(*dev)); - - // FIXME: This is overkill. Our malloc() will never return with - // a return value of NULL. So this is dead code (and thus would - // drop code coverage and usability in safety critical environments. - if (dev == NULL) { - die("DEV: out of memory.\n"); - } - memset(dev, 0, sizeof(dev)); + printk(BIOS_DEBUG, "default device constructor called\n"); dev->ops = constructor->ops; - return dev; } /** @@ -119,9 +136,6 @@ printk(BIOS_SPEW, "%s: cons 0x%lx, cons id %s\n", __func__, c, dev_id_string(&c->id)); if ((!c->ops) || (!c->ops->constructor)) { - printk(BIOS_INFO, - "Constructor for %s with missing ops or ops->constructor!\n", - dev_id_string(&c->id)); continue; } if (id_eq(&c->id, id)) { @@ -131,7 +145,7 @@ } } - return 0; + return NULL; } /** @@ -141,23 +155,22 @@ * Call that constructor via constructor->ops->constructor, with itself as * a parameter; return the result. * + * @param dev Pointer to the newly created device structure. * @param path Path to the device to be created. - * @return Pointer to the newly created device structure. * @see device_path */ -struct device *constructor(struct device_id *id) +void constructor(struct device *dev, struct device_id *id) { struct constructor *c; - struct device *dev = 0; c = find_constructor(id); - printk(BIOS_DEBUG, "%s constructor is 0x%lx\n", __func__, c); - if (!c) - return 0; - - dev = c->ops->constructor(c); - printk(BIOS_DEBUG, "%s returns 0x%lx\n", __func__, dev); - return dev; + printk(BIOS_SPEW, "%s: constructor is 0x%lx\n", __func__, c); + + if(c && c->ops && c->ops->constructor) + c->ops->constructor(dev, c); + else + printk(BIOS_INFO, "No constructor called for %s.\n", + dev_id_string(&c->id)); } /** @@ -177,24 +190,18 @@ struct device *dev, *child; int link; -// spin_lock(&dev_lock); + spin_lock(&dev_lock); /* Find the last child of our parent. */ for (child = parent->children; child && child->sibling; /* */) { child = child->sibling; } - dev = constructor(devid); - if (!dev) - printk(BIOS_DEBUG, "%s: No constructor, going with empty dev", - dev_id_string(devid)); + dev = new_device(); + if (!dev) /* Please don't do this at home */ + goto out; - dev = malloc(sizeof(*dev)); - if (dev == NULL) { - die("DEV: out of memory.\n"); - } memset(dev, 0, sizeof(*dev)); - memcpy(&dev->path, path, sizeof(*path)); /* Initialize the back pointers in the link fields. */ @@ -223,7 +230,14 @@ /* Give the device a name. */ sprintf(dev->dtsname, "dynamic %s", dev_path(dev)); - // spin_unlock(&dev_lock); + /* Run the device specific constructor as last part of the chain + * so it gets the chance to overwrite the "inherited" values above + */ + + constructor(dev, devid); + +out: + spin_unlock(&dev_lock); return dev; } Copied: LinuxBIOSv3/include/arch/x86/arch/elf.h (from rev 417, LinuxBIOSv3/include/arch/x86/archelf.h) =================================================================== --- LinuxBIOSv3/include/arch/x86/arch/elf.h (rev 0) +++ LinuxBIOSv3/include/arch/x86/arch/elf.h 2007-06-29 16:57:23 UTC (rev 418) @@ -0,0 +1,8 @@ +#ifndef ARCH_ELF_H +#define ARCH_ELF_H + +#define ELF_CLASS ELFCLASS32 +#define ELF_DATA ELFDATA2LSB +#define ELF_ARCH EM_386 + +#endif /* ARCH_ELF_H */ Added: LinuxBIOSv3/include/arch/x86/arch/spinlock.h =================================================================== --- LinuxBIOSv3/include/arch/x86/arch/spinlock.h (rev 0) +++ LinuxBIOSv3/include/arch/x86/arch/spinlock.h 2007-06-29 16:57:23 UTC (rev 418) @@ -0,0 +1,83 @@ +/* + * This file is part of the LinuxBIOS project. + * + * Copyright (C) 2001 Linux Networx + * + * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef ARCH_SPINLOCK_H +#define ARCH_SPINLOCK_H + +/* + * Your basic SMP spinlocks, allowing only a single CPU anywhere + */ + +typedef struct { + volatile unsigned int lock; +} spinlock_t; + + +#define SPIN_LOCK_UNLOCKED (spinlock_t) { 1 } + +/* + * Simple spin lock operations. There are two variants, one clears IRQ's + * on the local processor, one does not. + * + * We make no fairness assumptions. They have a cost. + */ +#define barrier() __asm__ __volatile__("": : :"memory") +#define spin_is_locked(x) (*(volatile char *)(&(x)->lock) <= 0) +#define spin_unlock_wait(x) do { barrier(); } while(spin_is_locked(x)) + +#define spin_lock_string \ + "\n1:\t" \ + "lock ; decb %0\n\t" \ + "js 2f\n" \ + ".section .text.lock,\"ax\"\n" \ + "2:\t" \ + "cmpb $0,%0\n\t" \ + "rep;nop\n\t" \ + "jle 2b\n\t" \ + "jmp 1b\n" \ + ".previous" + +/* + * This works. Despite all the confusion. + */ +#define spin_unlock_string \ + "movb $1,%0" + +static inline __attribute__((always_inline)) void spin_lock(spinlock_t *lock) +{ + __asm__ __volatile__( + spin_lock_string + :"=m" (lock->lock) : : "memory"); +} + +static inline __attribute__((always_inline)) void spin_unlock(spinlock_t *lock) +{ + __asm__ __volatile__( + spin_unlock_string + :"=m" (lock->lock) : : "memory"); +} + +/* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */ +static inline __attribute__((always_inline)) void cpu_relax(void) +{ + __asm__ __volatile__("rep;nop": : :"memory"); +} + +#endif /* ARCH_SPINLOCK_H */ Deleted: LinuxBIOSv3/include/arch/x86/archelf.h =================================================================== --- LinuxBIOSv3/include/arch/x86/archelf.h 2007-06-29 15:32:19 UTC (rev 417) +++ LinuxBIOSv3/include/arch/x86/archelf.h 2007-06-29 16:57:23 UTC (rev 418) @@ -1,8 +0,0 @@ -#ifndef ARCH_X86_ARCHELF_H -#define ARCH_X86_ARCHELF_H - -#define ELF_CLASS ELFCLASS32 -#define ELF_DATA ELFDATA2LSB -#define ELF_ARCH EM_386 - -#endif /* ARCH_X86_ARCHELF_H */ Modified: LinuxBIOSv3/include/device/device.h =================================================================== --- LinuxBIOSv3/include/device/device.h 2007-06-29 15:32:19 UTC (rev 417) +++ LinuxBIOSv3/include/device/device.h 2007-06-29 16:57:23 UTC (rev 418) @@ -112,18 +112,21 @@ void (*set_link)(struct device * dev, unsigned int link); void (*reset_bus)(struct bus *bus); - /* a constructor. The constructor for a given device is defined in the device source file. - * When is this called? Not for the static tree. When the scan bus code finds a new device, it must - * create it and insert it into the device tree. To do this, it calls a device constructor. - * The set of all device constructors is concatenated into the constructors array of structures via the usual - * gcc hack of naming a segment. - * The dev_constructor code in device.c iterates over the constructors array. - * A match consists of a path type, a vendor (which may be ignored if the constructo vendor value is 0), - * and a device id. - * When it finds a match, the dev_constructor calls the - * function constructors->constructor(constructors->constructor) and a new device is created. + /* A constructor. The constructor for a given device is defined in the + * device source file. When is this called? Not for the static tree. + * When the scan bus code finds a new device, it must create it and + * insert it into the device tree. To initialize it, it calls a device + * constructor. The set of all device constructors is concatenated + * into the constructors array of structures. + * + * The dev_constructor code in device.c iterates over the constructors + * array. A match consists of a path type, a vendor (which may be + * ignored if the constructor vendor value is 0), and a device id. + * When it finds a match, the dev_constructor calls the function + * constructors->constructor(constructors->constructor) and a new + * device is created. */ - struct device *(*constructor)(struct constructor *); + void (*constructor)(struct device *, struct constructor *); /* set device ops */ void (*phase1_set_device_operations)(struct device *dev); @@ -245,7 +248,7 @@ struct device * dev_find_class (unsigned int class, struct device * from); struct device * dev_find_slot (unsigned int bus, unsigned int devfn); struct device * dev_find_slot_on_smbus (unsigned int bus, unsigned int addr); -struct device *default_device_constructor(struct constructor *constructor); +void default_device_constructor(struct device *dev, struct constructor *constructor); /* Rounding for boundaries. Modified: LinuxBIOSv3/include/elf.h =================================================================== --- LinuxBIOSv3/include/elf.h 2007-06-29 15:32:19 UTC (rev 417) +++ LinuxBIOSv3/include/elf.h 2007-06-29 16:57:23 UTC (rev 418) @@ -31,7 +31,7 @@ #define ELF_H #include <types.h> -#include <archelf.h> +#include <arch/elf.h> /* Standard ELF types. */ Deleted: LinuxBIOSv3/include/stdlib.h =================================================================== --- LinuxBIOSv3/include/stdlib.h 2007-06-29 15:32:19 UTC (rev 417) +++ LinuxBIOSv3/include/stdlib.h 2007-06-29 16:57:23 UTC (rev 418) @@ -1,22 +0,0 @@ -/* - * This file is part of the LinuxBIOS project. - * - * Copyright (C) 2007 coresystems GmbH - * (Written by Stefan Reinauer <stepan(a)coresystems.de> for coresystems GmbH) - * - * 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; version 2 of the License. - * - * 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 St, Fifth Floor, Boston, MA, 02110-1301 USA - */ - -void *malloc(size_t size); - Modified: LinuxBIOSv3/lib/console.c =================================================================== --- LinuxBIOSv3/lib/console.c 2007-06-29 15:32:19 UTC (rev 417) +++ LinuxBIOSv3/lib/console.c 2007-06-29 16:57:23 UTC (rev 418) @@ -2,7 +2,6 @@ #include <hlt.h> #include <console.h> #include <uart8250.h> -// FIXME: we need this for varargs #include <stdarg.h> int vtxprintf(void (*)(unsigned char, void *arg), Deleted: LinuxBIOSv3/lib/malloc.c =================================================================== --- LinuxBIOSv3/lib/malloc.c 2007-06-29 15:32:19 UTC (rev 417) +++ LinuxBIOSv3/lib/malloc.c 2007-06-29 16:57:23 UTC (rev 418) @@ -1,92 +0,0 @@ -/* - * This file is part of the LinuxBIOS project. - * - * Copyright (C) 2007 Ronald G. Minnich <rminnich(a)gmail.com> - * - * 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; version 2 of the License. - * - * 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 St, Fifth Floor, Boston, MA, 02110-1301 USA - */ - -/* - * Simple non-freeing malloc. There have been about a million versions of - * this but we need one with a known author. Almost every OS and bootloader - * has had this at some time or other. - */ - -#include <types.h> -#include <stdlib.h> -#include <console.h> - -#if 0 -#define MALLOCDBG(x...) -#else -#define MALLOCDBG(x...) printk(BIOS_SPEW, x) -#endif - -/* - * Instead of ldscript magic, just declare an array. The array will consume - * no bytes in the image, and it won't run into trouble the way the v2 - * allocator could. We do not provide zero'd memory. - * - * Note that the execute-in-place (XIP) code in top of flash is not allowed - * to call malloc(), since we can't link this in to it. The flash-based code - * should always be dead simple (in fact, it's not clear we need malloc() at - * all any more -- we're doing our best to remove all usage of it -- the - * only real users were elfboot and lzma, and we have removed its usage in - * elfboot, and will try to remove its usage in lzma). - */ - -#define HEAPSIZE (256 * 1024) -static unsigned char heap[HEAPSIZE]; -static unsigned char *free_mem_ptr = heap; -static unsigned long freebytes = HEAPSIZE; - -/** - * Allocate 'size' bytes of memory. The memory is not zero'd. - * If not enough memory is available, just die. - * - * @param size The number of bytes to allocate. - * @return A pointer to the allocated memory. - */ -void *malloc(size_t size) -{ - void *p; - - MALLOCDBG("%s Enter, size %d, free_mem_ptr %p\n", - __FUNCTION__, size, free_mem_ptr); - - if (size > freebytes) { - die("Out of memory.\n"); - } - - size = (size + 3) & (~3); /* Align */ - - p = free_mem_ptr; - free_mem_ptr += size; - freebytes -= size; - - MALLOCDBG("malloc 0x%08lx\n", (unsigned long)p); - - return p; -} - -/** - * Free the specified memory area. - * This is a no-op, we don't care about freeing memory. - * - * @param where A pointer to the memory area to free. - */ -void free(void *where) -{ - /* Don't care. */ -} Modified: LinuxBIOSv3/util/dtc/dtc-parser.y =================================================================== --- LinuxBIOSv3/util/dtc/dtc-parser.y 2007-06-29 15:32:19 UTC (rev 417) +++ LinuxBIOSv3/util/dtc/dtc-parser.y 2007-06-29 16:57:23 UTC (rev 418) @@ -142,7 +142,7 @@ } ')' ';' { /* convention: first property is labeled with path */ - $6->label = strdup($3.val); + $6->label = strdup((char *)$3.val); $$ = $6 } |

1 0

[LinuxBIOS] r417 - LinuxBIOSv3/mainboard/artecgroup/dbe61
by svn＠openbios.org 29 Jun '07

29 Jun '07

Author: uwe Date: 2007-06-29 17:32:19 +0200 (Fri, 29 Jun 2007) New Revision: 417 Modified: LinuxBIOSv3/mainboard/artecgroup/dbe61/stage1.c Log: Use ARRAY_SIZE whereever possible (trivial). Signed-off-by: Uwe Hermann <uwe(a)hermann-uwe.de> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Modified: LinuxBIOSv3/mainboard/artecgroup/dbe61/stage1.c =================================================================== --- LinuxBIOSv3/mainboard/artecgroup/dbe61/stage1.c 2007-06-29 15:23:52 UTC (rev 416) +++ LinuxBIOSv3/mainboard/artecgroup/dbe61/stage1.c 2007-06-29 15:32:19 UTC (rev 417) @@ -44,7 +44,7 @@ static void dbe61_msr_init(void) { int i; - for(i = 0; i < sizeof(dbe61_msr)/sizeof(dbe61_msr[0]); i++) + for (i = 0; i < ARRAY_SIZE(dbe61_msr); i++) wrmsr(dbe61_msr[i].reg, dbe61_msr[i].msr); }

1 0

[LinuxBIOS] [PATCH] v3: Rename mainboard-part-number to mainboard-name
by Uwe Hermann 29 Jun '07

29 Jun '07

See patch. Uwe. -- http://www.hermann-uwe.de | http://www.holsham-traders.de http://www.crazy-hacks.org | http://www.unmaintained-free-software.org

2 2

← Newer
1
2
3
4
5
6
7
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

coreboot June 2007