GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arch/x86: Indent using tabs not spaces 

No functional changes - just whitespace fixes.
Signed-off-by: Martin Roth <martinroth@google.com>

Change-Id: I8ffa87240bcbd3d657ed9dc619b5e5bf9de734d7
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/12853
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Martin Roth 2016-01-06 15:21:02 -07:00
parent 67e11d1e4f
commit e369010ab8
8 changed files with 89 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/arch/x86/acpigen.c
View File

@ -653,7 +653,7 @@ void acpigen_write_resourcetemplate_footer(void)
acpigen_emit_byte(0x79); acpigen_emit_byte(0x79);
acpigen_emit_byte(0x00); acpigen_emit_byte(0x00);
len = gencurrent - p; len = gencurrent - p;
/* patch len word */ /* patch len word */
p[0] = len & 0xff; p[0] = len & 0xff;

4
src/arch/x86/boot.c
View File

@ -106,14 +106,14 @@ static void jmp_payload(void *entry, unsigned long buffer, unsigned long size)
/* Save the parameters I was passed */ /* Save the parameters I was passed */
#ifdef __x86_64__ #ifdef __x86_64__
" pushl $0\n\t" /* 20 adjust */ " pushl $0\n\t" /* 20 adjust */
" pushl %%eax\n\t" /* 16 lb_start */ " pushl %%eax\n\t" /* 16 lb_start */
" pushl %%ebx\n\t" /* 12 buffer */ " pushl %%ebx\n\t" /* 12 buffer */
" pushl %%ecx\n\t" /* 8 lb_size */ " pushl %%ecx\n\t" /* 8 lb_size */
" pushl %%edx\n\t" /* 4 entry */ " pushl %%edx\n\t" /* 4 entry */
" pushl %%esi\n\t" /* 0 elf_boot_notes */ " pushl %%esi\n\t" /* 0 elf_boot_notes */
#else #else
" pushl $0\n\t" /* 20 adjust */ " pushl $0\n\t" /* 20 adjust */
" pushl %0\n\t" /* 16 lb_start */ " pushl %0\n\t" /* 16 lb_start */
" pushl %1\n\t" /* 12 buffer */ " pushl %1\n\t" /* 12 buffer */
" pushl %2\n\t" /* 8 lb_size */ " pushl %2\n\t" /* 8 lb_size */
" pushl %3\n\t" /* 4 entry */ " pushl %3\n\t" /* 4 entry */

32
src/arch/x86/c_start.S
View File

@ -402,26 +402,26 @@ _idt_end:
SetCodeSelector: SetCodeSelector:
.intel_syntax noprefix .intel_syntax noprefix
# save rsp because iret will align it to a 16 byte boundary # save rsp because iret will align it to a 16 byte boundary
mov rdx, rsp mov rdx, rsp
# use iret to jump to a 64-bit offset in a new code segment # use iret to jump to a 64-bit offset in a new code segment
# iret will pop cs:rip, flags, then ss:rsp # iret will pop cs:rip, flags, then ss:rsp
mov ax, ss # need to push ss.. mov ax, ss # need to push ss..
push rax # push ss instuction not valid in x64 mode, so use ax push rax # push ss instuction not valid in x64 mode, so use ax
push rsp push rsp
pushfq pushfq
push rcx # cx is code segment selector from caller push rcx # cx is code segment selector from caller
mov rax, offset setCodeSelectorLongJump mov rax, offset setCodeSelectorLongJump
push rax push rax
# the iret will continue at next instruction, with the new cs value loaded # the iret will continue at next instruction, with the new cs value loaded
iretq iretq
setCodeSelectorLongJump: setCodeSelectorLongJump:
# restore rsp, it might not have been 16-byte aligned on entry # restore rsp, it might not have been 16-byte aligned on entry
mov rsp, rdx mov rsp, rdx
ret ret
.att_syntax prefix .att_syntax prefix
.previous .previous

4
src/arch/x86/cpu.c
View File

@ -107,8 +107,8 @@ static struct {
{ X86_VENDOR_UMC, "UMC UMC UMC ", }, { X86_VENDOR_UMC, "UMC UMC UMC ", },
{ X86_VENDOR_NEXGEN, "NexGenDriven", }, { X86_VENDOR_NEXGEN, "NexGenDriven", },
{ X86_VENDOR_CENTAUR, "CentaurHauls", }, { X86_VENDOR_CENTAUR, "CentaurHauls", },
{ X86_VENDOR_RISE, "RiseRiseRise", }, { X86_VENDOR_RISE, "RiseRiseRise", },
{ X86_VENDOR_TRANSMETA, "GenuineTMx86", }, { X86_VENDOR_TRANSMETA, "GenuineTMx86", },
{ X86_VENDOR_TRANSMETA, "TransmetaCPU", }, { X86_VENDOR_TRANSMETA, "TransmetaCPU", },
{ X86_VENDOR_NSC, "Geode by NSC", }, { X86_VENDOR_NSC, "Geode by NSC", },
{ X86_VENDOR_SIS, "SiS SiS SiS ", }, { X86_VENDOR_SIS, "SiS SiS SiS ", },

22
src/arch/x86/include/arch/cpu.h
View File

@ -217,21 +217,21 @@ static inline unsigned long cpu_index(void)
#ifndef __ROMCC__ // romcc is segfaulting in some cases #ifndef __ROMCC__ // romcc is segfaulting in some cases
struct cpuinfo_x86 { struct cpuinfo_x86 {
uint8_t x86; /* CPU family */ uint8_t x86; /* CPU family */
uint8_t x86_vendor; /* CPU vendor */ uint8_t x86_vendor; /* CPU vendor */
uint8_t x86_model; uint8_t x86_model;
uint8_t x86_mask; uint8_t x86_mask;
}; };
static inline void get_fms(struct cpuinfo_x86 *c, uint32_t tfms) static inline void get_fms(struct cpuinfo_x86 *c, uint32_t tfms)
{ {
c->x86 = (tfms >> 8) & 0xf; c->x86 = (tfms >> 8) & 0xf;
c->x86_model = (tfms >> 4) & 0xf; c->x86_model = (tfms >> 4) & 0xf;
c->x86_mask = tfms & 0xf; c->x86_mask = tfms & 0xf;
if (c->x86 == 0xf) if (c->x86 == 0xf)
c->x86 += (tfms >> 20) & 0xff; c->x86 += (tfms >> 20) & 0xff;
if (c->x86 >= 0x6) if (c->x86 >= 0x6)
c->x86_model += ((tfms >> 16) & 0xF) << 4; c->x86_model += ((tfms >> 16) & 0xF) << 4;
} }
#endif #endif

82
src/arch/x86/include/arch/io.h
View File

@ -190,27 +190,27 @@ static inline __attribute__((always_inline)) void write32(volatile void *addr, u
#if defined(__ROMCC__) #if defined(__ROMCC__)
static inline int log2(u32 value) static inline int log2(u32 value)
{ {
unsigned int r = 0; unsigned int r = 0;
__asm__ volatile ( __asm__ volatile (
"bsrl %1, %0\n\t" "bsrl %1, %0\n\t"
"jnz 1f\n\t" "jnz 1f\n\t"
"movl $-1, %0\n\t" "movl $-1, %0\n\t"
"1:\n\t" "1:\n\t"
: "=r" (r) : "r" (value)); : "=r" (r) : "r" (value));
return r; return r;
} }
static inline int __ffs(u32 value) static inline int __ffs(u32 value)
{ {
unsigned int r = 0; unsigned int r = 0;
__asm__ volatile ( __asm__ volatile (
"bsfl %1, %0\n\t" "bsfl %1, %0\n\t"
"jnz 1f\n\t" "jnz 1f\n\t"
"movl $-1, %0\n\t" "movl $-1, %0\n\t"
"1:\n\t" "1:\n\t"
: "=r" (r) : "r" (value)); : "=r" (r) : "r" (value));
return r; return r;
} }
#endif #endif
@ -218,15 +218,15 @@ static inline int __ffs(u32 value)
#ifdef __SIMPLE_DEVICE__ #ifdef __SIMPLE_DEVICE__
#define PCI_ADDR(SEGBUS, DEV, FN, WHERE) ( \ #define PCI_ADDR(SEGBUS, DEV, FN, WHERE) ( \
(((SEGBUS) & 0xFFF) << 20) | \ (((SEGBUS) & 0xFFF) << 20) | \
(((DEV) & 0x1F) << 15) | \ (((DEV) & 0x1F) << 15) | \
(((FN) & 0x07) << 12) | \ (((FN) & 0x07) << 12) | \
((WHERE) & 0xFFF)) ((WHERE) & 0xFFF))
#define PCI_DEV(SEGBUS, DEV, FN) ( \ #define PCI_DEV(SEGBUS, DEV, FN) ( \
(((SEGBUS) & 0xFFF) << 20) | \ (((SEGBUS) & 0xFFF) << 20) | \
(((DEV) & 0x1F) << 15) | \ (((DEV) & 0x1F) << 15) | \
(((FN) & 0x07) << 12)) (((FN) & 0x07) << 12))
#define PCI_ID(VENDOR_ID, DEVICE_ID) \ #define PCI_ID(VENDOR_ID, DEVICE_ID) \
((((DEVICE_ID) & 0xFFFF) << 16) | ((VENDOR_ID) & 0xFFFF)) ((((DEVICE_ID) & 0xFFFF) << 16) | ((VENDOR_ID) & 0xFFFF))
@ -267,14 +267,14 @@ void pci_or_config32(pci_devfn_t dev, unsigned where, uint32_t value)
#define PCI_DEV_INVALID (0xffffffffU) #define PCI_DEV_INVALID (0xffffffffU)
static inline pci_devfn_t pci_io_locate_device(unsigned pci_id, pci_devfn_t dev) static inline pci_devfn_t pci_io_locate_device(unsigned pci_id, pci_devfn_t dev)
{ {
for(; dev <= PCI_DEV(255, 31, 7); dev += PCI_DEV(0,0,1)) { for(; dev <= PCI_DEV(255, 31, 7); dev += PCI_DEV(0,0,1)) {
unsigned int id; unsigned int id;
id = pci_io_read_config32(dev, 0); id = pci_io_read_config32(dev, 0);
if (id == pci_id) { if (id == pci_id) {
return dev; return dev;
} }
} }
return PCI_DEV_INVALID; return PCI_DEV_INVALID;
} }
static inline pci_devfn_t pci_locate_device(unsigned pci_id, pci_devfn_t dev) static inline pci_devfn_t pci_locate_device(unsigned pci_id, pci_devfn_t dev)
@ -293,17 +293,17 @@ static inline pci_devfn_t pci_locate_device_on_bus(unsigned pci_id, unsigned bus
{ {
pci_devfn_t dev, last; pci_devfn_t dev, last;
dev = PCI_DEV(bus, 0, 0); dev = PCI_DEV(bus, 0, 0);
last = PCI_DEV(bus, 31, 7); last = PCI_DEV(bus, 31, 7);
for(; dev <=last; dev += PCI_DEV(0,0,1)) { for(; dev <=last; dev += PCI_DEV(0,0,1)) {
unsigned int id; unsigned int id;
id = pci_read_config32(dev, 0); id = pci_read_config32(dev, 0);
if (id == pci_id) { if (id == pci_id) {
return dev; return dev;
} }
} }
return PCI_DEV_INVALID; return PCI_DEV_INVALID;
} }
/* Generic functions for pnp devices */ /* Generic functions for pnp devices */

26
src/arch/x86/include/arch/pci_io_cfg.h
View File

@ -34,9 +34,9 @@ uint16_t pci_io_read_config16(pci_devfn_t dev, unsigned where)
{ {
unsigned addr; unsigned addr;
#if !CONFIG_PCI_IO_CFG_EXT #if !CONFIG_PCI_IO_CFG_EXT
addr = (dev>>4) | where; addr = (dev>>4) | where;
#else #else
addr = (dev>>4) | (where & 0xff) | ((where & 0xf00)<<16); addr = (dev>>4) | (where & 0xff) | ((where & 0xf00)<<16);
#endif #endif
outl(0x80000000 | (addr & ~3), 0xCF8); outl(0x80000000 | (addr & ~3), 0xCF8);
return inw(0xCFC + (addr & 2)); return inw(0xCFC + (addr & 2));
@ -47,9 +47,9 @@ uint32_t pci_io_read_config32(pci_devfn_t dev, unsigned where)
{ {
unsigned addr; unsigned addr;
#if !CONFIG_PCI_IO_CFG_EXT #if !CONFIG_PCI_IO_CFG_EXT
addr = (dev>>4) | where; addr = (dev>>4) | where;
#else #else
addr = (dev>>4) | (where & 0xff) | ((where & 0xf00)<<16); addr = (dev>>4) | (where & 0xff) | ((where & 0xf00)<<16);
#endif #endif
outl(0x80000000 | (addr & ~3), 0xCF8); outl(0x80000000 | (addr & ~3), 0xCF8);
return inl(0xCFC); return inl(0xCFC);
@ -60,9 +60,9 @@ void pci_io_write_config8(pci_devfn_t dev, unsigned where, uint8_t value)
{ {
unsigned addr; unsigned addr;
#if !CONFIG_PCI_IO_CFG_EXT #if !CONFIG_PCI_IO_CFG_EXT
addr = (dev>>4) | where; addr = (dev>>4) | where;
#else #else
addr = (dev>>4) | (where & 0xff) | ((where & 0xf00)<<16); addr = (dev>>4) | (where & 0xff) | ((where & 0xf00)<<16);
#endif #endif
outl(0x80000000 | (addr & ~3), 0xCF8); outl(0x80000000 | (addr & ~3), 0xCF8);
outb(value, 0xCFC + (addr & 3)); outb(value, 0xCFC + (addr & 3));
@ -71,14 +71,14 @@ void pci_io_write_config8(pci_devfn_t dev, unsigned where, uint8_t value)
static inline __attribute__((always_inline)) static inline __attribute__((always_inline))
void pci_io_write_config16(pci_devfn_t dev, unsigned where, uint16_t value) void pci_io_write_config16(pci_devfn_t dev, unsigned where, uint16_t value)
{ {
unsigned addr; unsigned addr;
#if !CONFIG_PCI_IO_CFG_EXT #if !CONFIG_PCI_IO_CFG_EXT
addr = (dev>>4) | where; addr = (dev>>4) | where;
#else #else
addr = (dev>>4) | (where & 0xff) | ((where & 0xf00)<<16); addr = (dev>>4) | (where & 0xff) | ((where & 0xf00)<<16);
#endif #endif
outl(0x80000000 | (addr & ~3), 0xCF8); outl(0x80000000 | (addr & ~3), 0xCF8);
outw(value, 0xCFC + (addr & 2)); outw(value, 0xCFC + (addr & 2));
} }
static inline __attribute__((always_inline)) static inline __attribute__((always_inline))
@ -86,9 +86,9 @@ void pci_io_write_config32(pci_devfn_t dev, unsigned where, uint32_t value)
{ {
unsigned addr; unsigned addr;
#if !CONFIG_PCI_IO_CFG_EXT #if !CONFIG_PCI_IO_CFG_EXT
addr = (dev>>4) | where; addr = (dev>>4) | where;
#else #else
addr = (dev>>4) | (where & 0xff) | ((where & 0xf00)<<16); addr = (dev>>4) | (where & 0xff) | ((where & 0xf00)<<16);
#endif #endif
outl(0x80000000 | (addr & ~3), 0xCF8); outl(0x80000000 | (addr & ~3), 0xCF8);
outl(value, 0xCFC); outl(value, 0xCFC);

6
src/arch/x86/tables.c
View File

@ -123,7 +123,7 @@ void write_tables(void)
if (new_high_table_pointer > ( high_table_pointer + MAX_ACPI_SIZE)) { if (new_high_table_pointer > ( high_table_pointer + MAX_ACPI_SIZE)) {
printk(BIOS_ERR, "ERROR: Increase ACPI size\n"); printk(BIOS_ERR, "ERROR: Increase ACPI size\n");
} }
printk(BIOS_DEBUG, "ACPI tables: %ld bytes.\n", printk(BIOS_DEBUG, "ACPI tables: %ld bytes.\n",
new_high_table_pointer - high_table_pointer); new_high_table_pointer - high_table_pointer);
/* Now we need to create a low table copy of the RSDP. */ /* Now we need to create a low table copy of the RSDP. */
@ -170,7 +170,7 @@ void write_tables(void)
if (new_high_table_pointer > ( high_table_pointer + MAX_SMBIOS_SIZE)) { if (new_high_table_pointer > ( high_table_pointer + MAX_SMBIOS_SIZE)) {
printk(BIOS_ERR, "ERROR: Increase SMBIOS size\n"); printk(BIOS_ERR, "ERROR: Increase SMBIOS size\n");
} }
printk(BIOS_DEBUG, "SMBIOS tables: %ld bytes.\n", printk(BIOS_DEBUG, "SMBIOS tables: %ld bytes.\n",
new_high_table_pointer - high_table_pointer); new_high_table_pointer - high_table_pointer);
} else { } else {
unsigned long new_rom_table_end = smbios_write_tables(rom_table_end); unsigned long new_rom_table_end = smbios_write_tables(rom_table_end);
@ -204,7 +204,7 @@ void write_tables(void)
__func__, new_high_table_pointer - __func__, new_high_table_pointer -
high_table_pointer); high_table_pointer);
printk(BIOS_DEBUG, "coreboot table: %ld bytes.\n", printk(BIOS_DEBUG, "coreboot table: %ld bytes.\n",
new_high_table_pointer - high_table_pointer); new_high_table_pointer - high_table_pointer);
} else { } else {
/* The coreboot table must be in 0-4K or 960K-1M */ /* The coreboot table must be in 0-4K or 960K-1M */