Emulation/switch-coreboot
1
0
Fork 0
mirror of https://github.com/fail0verflow/switch-coreboot.git synced 2025-05-04 01:39:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Patches for tyson that do the following:

Browse source 
Added set_initrd() to params.h and params.c.

Added PRINTK macro and KERN_SPEW to printk.h.

Changed fill_inbuf.c to accept zkernel_start and zknernel_mask as
variables that can be set by linuxbiosmain().

Changed linuxbiosmain() to allow custom code to modify some parameters
such as where the kernel image is located in ROM, the initrd parameters
and the command line.

Change most of the DBG's in newpci.c to PRINTK(KERN_SPEW...  This was
the worst offender when DEBUG was defined.  Some of it was changed to
KERN_DEBUG.

There are no new files this time, however,
freebios-010214.orig/src/superio/SMC/fdc37n769/superio.inc
remains and needs to be deleted and then 'cvs rm'.

None of these changes should break any other code.  The same
ZKERNEL_START, ZKERNEL_MASK and CMD_LINE defines are still used, but
are now all used in linuxbiosmain() and used to initialize variables
that can later be changed rather than used directly.

These changes allow me to choose between two kernel images, optionally
use an initrd image, load the initrd image and set the kernel command
line as needed.
This commit is contained in:
Ronald G. Minnich 2001-02-15 15:23:06 +00:00
parent 008d0a742a
commit e94eeb3d9d
5 changed files with 92 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/include/params.h
View file

@ -8,3 +8,7 @@ void set_command_line(unsigned char *empty_zero_page,
unsigned char *cmdline);
unsigned char *get_empty_zero_page(void);
void set_display(unsigned char *empty_zero_page, int rows, int cols);
void set_initrd(unsigned char *empty_zero_page,
unsigned long start,
unsigned long size);

3
src/include/printk.h
View file

@ -11,14 +11,17 @@
#define KERN_NOTICE "<5>" /* normal but significant condition */
#define KERN_INFO "<6>" /* informational */
#define KERN_DEBUG "<7>" /* debug-level messages */
#define KERN_SPEW "<8>" /* Way too many details */
extern int console_loglevel;
int printk(const char *fmt, ...);
#ifdef DEBUG
#define DBG(x...) printk(KERN_DEBUG x)
#define PRINTK(x...) printk(x)
#else
#define DBG(x...)
#define PRINTK(x...)
#endif
#endif

47
src/lib/linuxbiosmain.c
View file

@ -1480,12 +1480,18 @@ void setup_apic()
}
}
unsigned char *zkernel_start;
unsigned long zkernel_mask;
int
linuxbiosmain(unsigned long base, unsigned long totalram)
{
unsigned char *empty_zero_page;
extern int firstfill;
unsigned char *cmd_line;
unsigned long initrd_start, initrd_size;
/* common globals -- don't rely on init! */
insize = 0;
inptr = 0;
@ -1502,6 +1508,36 @@ linuxbiosmain(unsigned long base, unsigned long totalram)
printk("Version 0.1\n");
printk("\n");
initrd_start = 0;
initrd_size = 0;
#ifdef CMD_LINE
cmd_line = CMD_LINE;
#else
cmd_line = "root=/dev/hda1 single";
#endif
#ifdef ZKERNEL_START
zkernel_start = (unsigned char *)ZKERNEL_START;
#else
zkernel_start = (unsigned char *)0xfff80000;
#endif
#ifdef ZKERNEL_MASK
zkernel_mask = ZKERNEL_MASK;
#else
zkernel_mask = 0x0000ffff;
#endif
#ifdef LOADER_SETUP
loader_setup(base,
totalram,
&initrd_start,
&initrd_size,
&cmd_line,
&zkernel_start,
&zkernel_mask);
#endif
setup_output_buffer();
DBG("Making CRC\n");
@ -1532,16 +1568,13 @@ linuxbiosmain(unsigned long base, unsigned long totalram)
*/
set_memory_size(empty_zero_page, 0x3c00, totalram - 2048);
intel_post(0xfa);
#ifdef CMD_LINE
DBG("using custom command line - [%s]\n", CMD_LINE);
#else
#define CMD_LINE "root=/dev/hda1 single"
DBG("using default command line - [%s]\n", CMD_LINE);
#endif
set_command_line(empty_zero_page, CMD_LINE);
PRINTK(KERN_NOTICE "command line - [%s]\n", cmd_line);
set_command_line(empty_zero_page, cmd_line);
set_root_rdonly(empty_zero_page);
set_display(empty_zero_page, 25, 80);
set_initrd(empty_zero_page, initrd_start, initrd_size);
/* set up the IO-APIC for the clock interrupt. */
/* this needs to move to intel_main.c at some point. */

72
src/lib/newpci.c
View file

@ -267,7 +267,7 @@ int pci_read_config_byte(struct pci_dev *dev, u8 where, u8 * val)
{
int res;
res = conf->read_byte(dev->bus->number, dev->devfn, where, val);
DBG("Read config byte bus %d,devfn 0x%x,reg 0x%x,val 0x%x,res 0x%x\n",
PRINTK(KERN_SPEW "Read config byte bus %d,devfn 0x%x,reg 0x%x,val 0x%x,res 0x%x\n",
dev->bus->number, dev->devfn, where, *val, res);
return res;
@ -278,7 +278,7 @@ int pci_read_config_word(struct pci_dev *dev, u8 where, u16 * val)
{
int res;
res = conf->read_word(dev->bus->number, dev->devfn, where, val);
DBG("Read config word bus %d,devfn 0x%x,reg 0x%x,val 0x%x,res 0x%x\n",
PRINTK(KERN_SPEW "Read config word bus %d,devfn 0x%x,reg 0x%x,val 0x%x,res 0x%x\n",
dev->bus->number, dev->devfn, where, *val, res);
return res;
}
@ -287,21 +287,21 @@ int pci_read_config_dword(struct pci_dev *dev, u8 where, u32 * val)
{
int res;
res = conf->read_dword(dev->bus->number, dev->devfn, where, val);
DBG("Read config dword bus %d,devfn 0x%x,reg 0x%x,val 0x%x,res 0x%x\n",
PRINTK(KERN_SPEW "Read config dword bus %d,devfn 0x%x,reg 0x%x,val 0x%x,res 0x%x\n",
dev->bus->number, dev->devfn, where, *val, res);
return res;
}
int pci_write_config_byte(struct pci_dev *dev, u8 where, u8 val)
{
DBG("Write config byte bus %d, devfn 0x%x, reg 0x%x, val 0x%x\n",
PRINTK(KERN_SPEW "Write config byte bus %d, devfn 0x%x, reg 0x%x, val 0x%x\n",
dev->bus->number, dev->devfn, where, val);
return conf->write_byte(dev->bus->number, dev->devfn, where, val);
}
int pci_write_config_word(struct pci_dev *dev, u8 where, u16 val)
{
DBG("Write config word bus %d, devfn 0x%x, reg 0x%x, val 0x%x\n",
PRINTK(KERN_SPEW "Write config word bus %d, devfn 0x%x, reg 0x%x, val 0x%x\n",
dev->bus->number, dev->devfn, where, val);
return conf->write_word(dev->bus->number, dev->devfn, where, val);
@ -309,7 +309,7 @@ int pci_write_config_word(struct pci_dev *dev, u8 where, u16 val)
int pci_write_config_dword(struct pci_dev *dev, u8 where, u32 val)
{
DBG("Write config dword bus %d, devfn 0x%x, reg 0x%x, val 0x%x\n",
PRINTK(KERN_SPEW "Write config dword bus %d, devfn 0x%x, reg 0x%x, val 0x%x\n",
dev->bus->number, dev->devfn, where, val);
return conf->write_dword(dev->bus->number, dev->devfn, where, val);
}
@ -318,7 +318,7 @@ int pcibios_read_config_byte(unsigned char bus, unsigned char devfn, u8 where, u
{
int res;
res = conf->read_byte(bus, devfn, where, val);
DBG("Read config byte bus %d,devfn 0x%x,reg 0x%x,val 0x%x,res 0x%x\n",
PRINTK(KERN_SPEW "Read config byte bus %d,devfn 0x%x,reg 0x%x,val 0x%x,res 0x%x\n",
bus, devfn, where, *val, res);
return res;
}
@ -327,7 +327,7 @@ int pcibios_read_config_word(unsigned char bus, unsigned char devfn, u8 where, u
{
int res;
res = conf->read_word(bus, devfn, where, val);
DBG("Read config word bus %d,devfn 0x%x,reg 0x%x,val 0x%x,res 0x%x\n",
PRINTK(KERN_SPEW "Read config word bus %d,devfn 0x%x,reg 0x%x,val 0x%x,res 0x%x\n",
bus, devfn, where, *val, res);
return res;
@ -337,7 +337,7 @@ int pcibios_read_config_dword(unsigned char bus, unsigned char devfn, u8 where,
{
int res;
res = conf->read_dword(bus, devfn, where, val);
DBG("Read config dword bus %d,devfn 0x%x,reg 0x%x,val 0x%x,res 0x%x\n",
PRINTK(KERN_SPEW "Read config dword bus %d,devfn 0x%x,reg 0x%x,val 0x%x,res 0x%x\n",
bus, devfn, where, *val, res);
return res;
@ -345,7 +345,7 @@ int pcibios_read_config_dword(unsigned char bus, unsigned char devfn, u8 where,
int pcibios_write_config_byte(unsigned char bus, unsigned char devfn, u8 where, u8 val)
{
DBG("Write byte bus %d, devfn 0x%x, reg 0x%x, val 0x%x\n",
PRINTK(KERN_SPEW "Write byte bus %d, devfn 0x%x, reg 0x%x, val 0x%x\n",
bus, devfn, where, val);
return conf->write_byte(bus, devfn, where, val);
@ -353,7 +353,7 @@ int pcibios_write_config_byte(unsigned char bus, unsigned char devfn, u8 where,
int pcibios_write_config_word(unsigned char bus, unsigned char devfn, u8 where, u16 val)
{
DBG("Write word bus %d, devfn 0x%x, reg 0x%x, val 0x%x\n",
PRINTK(KERN_SPEW "Write word bus %d, devfn 0x%x, reg 0x%x, val 0x%x\n",
bus, devfn, where, val);
return conf->write_word(bus, devfn, where, val);
@ -361,7 +361,7 @@ int pcibios_write_config_word(unsigned char bus, unsigned char devfn, u8 where,
int pcibios_write_config_dword(unsigned char bus, unsigned char devfn, u8 where, u32 val)
{
DBG("Write doubleword bus %d, devfn 0x%x, reg 0x%x, val 0x%x\n",
PRINTK(KERN_SPEW "Write doubleword bus %d, devfn 0x%x, reg 0x%x, val 0x%x\n",
bus, devfn, where, val);
return conf->write_dword(bus, devfn, where, val);
}
@ -449,7 +449,7 @@ void compute_allocate_io(struct pci_bus *bus)
unsigned long io_base;
io_base = bus->iobase;
DBG("compute_allocate_io: base 0x%lx\n", bus->iobase);
PRINTK(KERN_DEBUG"compute_allocate_io: base 0x%lx\n", bus->iobase);
/* First, walk all the bridges. When you return, grow the limit of the current bus
since sub-busses need IO rounded to 4096 */
@ -457,7 +457,7 @@ void compute_allocate_io(struct pci_bus *bus)
curbus->iobase = io_base;
compute_allocate_io(curbus);
io_base = round(curbus->iolimit, IO_BRIDGE_ALIGN);
DBG("BUSIO: done Bridge Bus 0x%x, iobase now 0x%lx\n",
PRINTK(KERN_DEBUG"BUSIO: done Bridge Bus 0x%x, iobase now 0x%lx\n",
curbus->number, io_base);
}
@ -470,7 +470,7 @@ void compute_allocate_io(struct pci_bus *bus)
if (!iosize)
continue;
DBG("DEVIO: Bus 0x%x, devfn 0x%x, reg 0x%x: "
PRINTK(KERN_DEBUG"DEVIO: Bus 0x%x, devfn 0x%x, reg 0x%x: "
"iosize 0x%lx\n",
curdev->bus->number, curdev->devfn, i, iosize);
curdev->base_address[i] = io_base;
@ -478,7 +478,7 @@ void compute_allocate_io(struct pci_bus *bus)
// (e.g. VIA 82c686a.) So set it to be safe)
curdev->base_address[i] |=
PCI_BASE_ADDRESS_SPACE_IO;
DBG("-->set base to 0x%lx\n", io_base);
PRINTK(KERN_DEBUG"-->set base to 0x%lx\n", io_base);
io_base += round(iosize, IO_ALIGN);
curdev->command |= PCI_COMMAND_IO;
}
@ -486,7 +486,7 @@ void compute_allocate_io(struct pci_bus *bus)
}
bus->iolimit = iolimit(io_base);
DBG("BUS %d: set iolimit to 0x%lx\n", bus->number, bus->iolimit);
PRINTK(KERN_DEBUG"BUS %d: set iolimit to 0x%lx\n", bus->number, bus->iolimit);
}
/** Compute and allocate the memory for this bus.
@ -500,7 +500,7 @@ void compute_allocate_mem(struct pci_bus *bus)
unsigned long mem_base;
mem_base = bus->membase;
DBG("compute_allocate_mem: base 0x%lx\n", bus->membase);
PRINTK(KERN_DEBUG"compute_allocate_mem: base 0x%lx\n", bus->membase);
/* First, walk all the bridges. When you return, grow the limit of the current bus
since sub-busses need MEMORY rounded to 1 Mega */
@ -508,7 +508,7 @@ void compute_allocate_mem(struct pci_bus *bus)
curbus->membase = mem_base;
compute_allocate_mem(curbus);
mem_base = round(curbus->memlimit, ONEMEG);
DBG("BUSMEM: Bridge Bus 0x%x,membase now 0x%lx\n",
PRINTK(KERN_DEBUG"BUSMEM: Bridge Bus 0x%x,membase now 0x%lx\n",
curbus->number, mem_base);
}
@ -549,11 +549,11 @@ void compute_allocate_mem(struct pci_bus *bus)
consumed in 4KB unit */
regmem = round(memorysize, MEM_ALIGN);
mem_base = round(mem_base, regmem);
DBG("DEVMEM: Bus 0x%x, devfn 0x%x, reg 0x%x: "
PRINTK(KERN_DEBUG"DEVMEM: Bus 0x%x, devfn 0x%x, reg 0x%x: "
"memsize 0x%lx\n",
curdev->bus->number, curdev->devfn, i, regmem);
curdev->base_address[i] = mem_base;
DBG("-->set base to 0x%lx\n", mem_base);
PRINTK(KERN_DEBUG"-->set base to 0x%lx\n", mem_base);
mem_base += regmem;
curdev->command |= PCI_COMMAND_MEMORY;
// for 64-bit BARs, the odd ones don't count
@ -565,7 +565,7 @@ void compute_allocate_mem(struct pci_bus *bus)
}
bus->memlimit = memlimit(mem_base);
DBG("BUS %d: set memlimit to 0x%lx\n", bus->number, bus->memlimit);
PRINTK(KERN_DEBUG"BUS %d: set memlimit to 0x%lx\n", bus->number, bus->memlimit);
}
/** Compute and allocate the prefetch memory for this bus.
@ -579,7 +579,7 @@ void compute_allocate_prefmem(struct pci_bus *bus)
unsigned long prefmem_base;
prefmem_base = bus->prefmembase;
DBG("Compute_allocate_prefmem: base 0x%lx\n", bus->prefmembase);
PRINTK(KERN_DEBUG"Compute_allocate_prefmem: base 0x%lx\n", bus->prefmembase);
/* First, walk all the bridges. When you return, grow the limit of the current bus
since sub-busses need MEMORY rounded to 1 Mega */
@ -587,7 +587,7 @@ void compute_allocate_prefmem(struct pci_bus *bus)
curbus->prefmembase = prefmem_base;
compute_allocate_prefmem(curbus);
prefmem_base = round(curbus->prefmemlimit, ONEMEG);
DBG("BUSPREFMEM: Bridge Bus 0x%x, prefmem base now 0x%lx\n",
PRINTK(KERN_DEBUG"BUSPREFMEM: Bridge Bus 0x%x, prefmem base now 0x%lx\n",
curbus->number, prefmem_base);
}
@ -627,11 +627,11 @@ void compute_allocate_prefmem(struct pci_bus *bus)
consumed in 4KB unit */
regmem = round(memorysize, MEM_ALIGN);
prefmem_base = round(prefmem_base, regmem);
DBG("DEVPREFMEM: Bus 0x%x, devfn 0x%x, reg 0x%x: "
PRINTK(KERN_DEBUG"DEVPREFMEM: Bus 0x%x, devfn 0x%x, reg 0x%x: "
"prefmemsize 0x%lx\n",
curdev->bus->number, curdev->devfn, i, regmem);
curdev->base_address[i] = prefmem_base;
DBG("-->set base to 0x%lx\n", prefmem_base);
PRINTK(KERN_DEBUG"-->set base to 0x%lx\n", prefmem_base);
prefmem_base += regmem;
curdev->command |= PCI_COMMAND_MEMORY;
// for 64-bit BARs, the odd ones don't count
@ -642,7 +642,7 @@ void compute_allocate_prefmem(struct pci_bus *bus)
}
bus->prefmemlimit = memlimit(prefmem_base);
DBG("BUS %d: set prefmemlimit to 0x%lx\n", bus->number, bus->prefmemlimit);
PRINTK(KERN_DEBUG"BUS %d: set prefmemlimit to 0x%lx\n", bus->number, bus->prefmemlimit);
}
/** Compute and allocate resources.
@ -653,16 +653,16 @@ void compute_allocate_prefmem(struct pci_bus *bus)
*/
void compute_allocate_resources(struct pci_bus *bus)
{
DBG("COMPUTE_ALLOCATE: do IO\n");
PRINTK(KERN_DEBUG"COMPUTE_ALLOCATE: do IO\n");
compute_allocate_io(bus);
DBG("COMPUTE_ALLOCATE: do MEM\n");
PRINTK(KERN_DEBUG"COMPUTE_ALLOCATE: do MEM\n");
compute_allocate_mem(bus);
// now put the prefetchable memory at the end of the memory
bus->prefmembase = round(bus->memlimit, ONEMEG);
DBG("COMPUTE_ALLOCATE: do PREFMEM\n");
PRINTK(KERN_DEBUG"COMPUTE_ALLOCATE: do PREFMEM\n");
compute_allocate_prefmem(bus);
}
@ -676,7 +676,7 @@ void assign_resources(struct pci_bus *bus)
struct pci_dev *curdev = pci_devices;
struct pci_bus *curbus;
DBG("ASSIGN RESOURCES, bus %d\n", bus->number);
PRINTK(KERN_DEBUG"ASSIGN RESOURCES, bus %d\n", bus->number);
/* wlak trhough all the buses, assign resources for bridges */
for (curbus = bus->children; curbus; curbus = curbus->next) {
@ -690,7 +690,7 @@ void assign_resources(struct pci_bus *bus)
curbus->iobase >> 8);
pci_write_config_byte(curbus->self, PCI_IO_LIMIT,
curbus->iolimit >> 8);
DBG("Bus 0x%x iobase to 0x%x iolimit 0x%x\n",
PRINTK(KERN_DEBUG"Bus 0x%x iobase to 0x%x iolimit 0x%x\n",
bus->number, curbus->iobase, curbus->iolimit);
}
@ -701,7 +701,7 @@ void assign_resources(struct pci_bus *bus)
curbus->membase >> 16);
pci_write_config_word(curbus->self, PCI_MEMORY_LIMIT,
curbus->memlimit >> 16);
DBG("Bus 0x%x membase to 0x%x memlimit 0x%x\n",
PRINTK(KERN_DEBUG"Bus 0x%x membase to 0x%x memlimit 0x%x\n",
bus->number, curbus->membase, curbus->memlimit);
}
@ -713,7 +713,7 @@ void assign_resources(struct pci_bus *bus)
curbus->prefmembase >> 16);
pci_write_config_word(curbus->self, PCI_PREF_MEMORY_LIMIT,
curbus->prefmemlimit >> 16);
DBG("Bus 0x%x prefmembase to 0x%x prefmemlimit 0x%x\n",
PRINTK(KERN_DEBUG"Bus 0x%x prefmembase to 0x%x prefmemlimit 0x%x\n",
bus->number, curbus->prefmembase, curbus->prefmemlimit);
}
@ -729,7 +729,7 @@ void assign_resources(struct pci_bus *bus)
reg = PCI_BASE_ADDRESS_0 + (i << 2);
pci_write_config_dword(curdev, reg, curdev->base_address[i]);
DBG("Bus 0x%x devfn 0x%x reg 0x%x base to 0x%lx\n",
PRINTK(KERN_DEBUG"Bus 0x%x devfn 0x%x reg 0x%x base to 0x%lx\n",
curdev->bus->number, curdev->devfn, i,
curdev->base_address[i]);
}
@ -748,7 +748,7 @@ void enable_resources(struct pci_bus *bus)
pci_read_config_word(curdev, PCI_COMMAND, &command);
command |= curdev->command;
pci_write_config_word(curdev, PCI_COMMAND, command);
DBG("DEV Set command bus 0x%x devfn 0x%x to 0x%x\n",
PRINTK(KERN_DEBUG"DEV Set command bus 0x%x devfn 0x%x to 0x%x\n",
curdev->bus->number, curdev->devfn, command);
}
}

12
src/northbridge/acer/m1631/ipl.S
View file

@ -17,10 +17,12 @@
* ror it 16 bits, and as we grow the CAS, we just inc cs, and that will
* set the right value.
*/
/* SDRAM (28:27 == 10), 1st row present (26:25=11),
* no 2nd row yet (24:23=00), 256 MB (22:20 = 110),
* 10 bits CA (minimum for SDRAM 19:16=2), CAS3 (12:11 = 10)
*/
/* 0xf in high order due to other settings */
#define INIT_MCR $0xf6621000
#undef INIT_MCR
/* I think that f662 is wrong. We need to make it 0xf6601000 */
#define INIT_MCR $0xf6021000
#define WRITE_MCR0 movl %ecx, %eax ; outl %eax, %dx
/*#include <cpu/p5/start32.inc>*/
@ -111,6 +113,10 @@ code16
/* clear out the CAS, since we assume start at zero
* and increment
*/
/* NOTE: we set 10-bit above. If it only uses 8 bits it will
* wrap. So it is OK that we clear out the CAS to 0
* (WE THINK ...)
*/
andb $0xf0, %cl
/* test 8 bit CAS */
movb $0, 0