sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

src/arch: Improve code formatting

Browse Source 
Change-Id: Ic1ca6c2e1cd06800d7eb2d00ac0b328987d022ef
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/16434
Tested-by: build bot (Jenkins)
Reviewed-by: Omar Pakker
This commit is contained in:
Elyes HAOUAS
2016-09-03 08:28:48 +02:00
committed by Martin Roth
parent c7702536ed
commit 6b72787d27
7 changed files with 113 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
src/arch/arm/armv7/mmu.c
View File

@@ -280,53 +280,53 @@ void mmu_init(void)
for (; (pte_t *)_ettb_subtables - table > 0; table += SUBTABLE_PTES) for (; (pte_t *)_ettb_subtables - table > 0; table += SUBTABLE_PTES)
table[0] = ATTR_UNUSED; table[0] = ATTR_UNUSED;
if (CONFIG_ARM_LPAE) { if (CONFIG_ARM_LPAE) {
pte_t *const pgd_buff = (pte_t*)(_ttb + 16*KiB); pte_t *const pgd_buff = (pte_t*)(_ttb + 16*KiB);
pte_t *pmd = ttb_buff; pte_t *pmd = ttb_buff;
int i; int i;
printk(BIOS_DEBUG, "LPAE Translation tables are @ %p\n", printk(BIOS_DEBUG, "LPAE Translation tables are @ %p\n",
ttb_buff); ttb_buff);
ASSERT((read_mmfr0() & 0xf) >= 5); ASSERT((read_mmfr0() & 0xf) >= 5);
/* /*
* Set MAIR * Set MAIR
* See B4.1.104 of ARMv7 Architecture Reference Manual * See B4.1.104 of ARMv7 Architecture Reference Manual
*/ */
write_mair0( write_mair0(
0x00 << (MAIR_INDX_NC*8) | /* Strongly-ordered, 0x00 << (MAIR_INDX_NC*8) | /* Strongly-ordered,
* Non-Cacheable */ * Non-Cacheable */
0xaa << (MAIR_INDX_WT*8) | /* Write-Thru, 0xaa << (MAIR_INDX_WT*8) | /* Write-Thru,
* Read-Allocate */ * Read-Allocate */
0xff << (MAIR_INDX_WB*8) /* Write-Back, 0xff << (MAIR_INDX_WB*8) /* Write-Back,
* Read/Write-Allocate */ * Read/Write-Allocate */
); );
/* /*
* Set up L1 table * Set up L1 table
* Once set here, L1 table won't be modified by coreboot. * Once set here, L1 table won't be modified by coreboot.
* See B3.6.1 of ARMv7 Architecture Reference Manual * See B3.6.1 of ARMv7 Architecture Reference Manual
*/ */
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
pgd_buff[i] = ((uint32_t)pmd & NEXTLEVEL_MASK) | pgd_buff[i] = ((uint32_t)pmd & NEXTLEVEL_MASK) |
ATTR_NEXTLEVEL; ATTR_NEXTLEVEL;
pmd += BLOCK_SIZE / PAGE_SIZE; pmd += BLOCK_SIZE / PAGE_SIZE;
} }
/* /*
* Set TTBR0 * Set TTBR0
*/ */
write_ttbr0((uintptr_t)pgd_buff); write_ttbr0((uintptr_t)pgd_buff);
} else { } else {
printk(BIOS_DEBUG, "Translation table is @ %p\n", ttb_buff); printk(BIOS_DEBUG, "Translation table is @ %p\n", ttb_buff);
/* /*
* Translation table base 0 address is in bits 31:14-N, where N * Translation table base 0 address is in bits 31:14-N, where N
* is given by bits 2:0 in TTBCR (which we set to 0). All lower * is given by bits 2:0 in TTBCR (which we set to 0). All lower
* bits in this register should be zero for coreboot. * bits in this register should be zero for coreboot.
*/ */
write_ttbr0((uintptr_t)ttb_buff); write_ttbr0((uintptr_t)ttb_buff);
} }
/* /*
* Set TTBCR * Set TTBCR

4
src/arch/arm/armv7/thread.c
View File

@@ -55,7 +55,7 @@ void arch_prepare_thread(struct thread *t,
* hunting for (e.g.) misaligned stacks or other such * hunting for (e.g.) misaligned stacks or other such
* weirdness. The -1 is because we already pushed lr. * weirdness. The -1 is because we already pushed lr.
*/ */
for (i = 0; i < sizeof(struct pushed_regs)/sizeof(u32)-1; i++) for (i = 0; i < sizeof(struct pushed_regs) / sizeof(u32) - 1; i++)
stack = push_stack(stack, poison++); stack = push_stack(stack, poison++);
t->stack_current = stack; t->stack_current = stack;
@@ -103,7 +103,7 @@ switch_to_thread(uintptr_t new_stack, uintptr_t *saved_stack)
* | R4 | <-- sp + 0x00 * | R4 | <-- sp + 0x00
* +------------+ * +------------+
*/ */
asm volatile ( asm volatile (
/* save context. */ /* save context. */
"push {r4-r11,lr}\n\t" "push {r4-r11,lr}\n\t"
/* Save the current stack */ /* Save the current stack */

6
src/arch/arm/include/armv7/arch/cpu.h
View File

@@ -39,9 +39,9 @@ struct cpu_info {
}; };
struct cpuinfo_arm { struct cpuinfo_arm {
uint8_t arm; /* CPU family */ uint8_t arm; /* CPU family */
uint8_t arm_vendor; /* CPU vendor */ uint8_t arm_vendor; /* CPU vendor */
uint8_t arm_model; uint8_t arm_model;
}; };
#endif #endif

4
src/arch/arm64/transition_asm.S
View File

@@ -124,8 +124,8 @@ ENDPROC(exc_prologue)
* x0 = regs structure * x0 = regs structure
*/ */
ENTRY(trans_switch) ENTRY(trans_switch)
msr SPSel, #SPSR_USE_L msr SPSel, #SPSR_USE_L
b exc_exit b exc_exit
ENDPROC(trans_switch) ENDPROC(trans_switch)
/* /*

6
src/arch/riscv/include/arch/cpu.h
View File

@@ -37,9 +37,9 @@ struct cpu_info {
}; };
struct cpuinfo_riscv { struct cpuinfo_riscv {
uint8_t riscv; /* CPU family */ uint8_t riscv; /* CPU family */
uint8_t riscv_vendor; /* CPU vendor */ uint8_t riscv_vendor; /* CPU vendor */
uint8_t riscv_model; uint8_t riscv_model;
}; };
#endif #endif

2
src/arch/riscv/include/arch/hlt.h
View File

@@ -13,5 +13,5 @@
static inline __attribute__((always_inline)) void hlt(void) static inline __attribute__((always_inline)) void hlt(void)
{ {
while(1); while (1);
} }

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

@@ -339,8 +339,8 @@ void acpigen_write_scope(const char *name)
void acpigen_write_processor(u8 cpuindex, u32 pblock_addr, u8 pblock_len) void acpigen_write_processor(u8 cpuindex, u32 pblock_addr, u8 pblock_len)
{ {
/* /*
Processor (\_PR.CPUcpuindex, cpuindex, pblock_addr, pblock_len) Processor (\_PR.CPUcpuindex, cpuindex, pblock_addr, pblock_len)
{ {
*/ */
char pscope[16]; char pscope[16];
/* processor op */ /* processor op */
@@ -359,26 +359,26 @@ void acpigen_write_processor(u8 cpuindex, u32 pblock_addr, u8 pblock_len)
void acpigen_write_empty_PCT(void) void acpigen_write_empty_PCT(void)
{ {
/* /*
Name (_PCT, Package (0x02) Name (_PCT, Package (0x02)
{ {
ResourceTemplate () ResourceTemplate ()
{ {
Register (FFixedHW, Register (FFixedHW,
0x00, // Bit Width 0x00, // Bit Width
0x00, // Bit Offset 0x00, // Bit Offset
0x0000000000000000, // Address 0x0000000000000000, // Address
,) ,)
}, },
ResourceTemplate () ResourceTemplate ()
{ {
Register (FFixedHW, Register (FFixedHW,
0x00, // Bit Width 0x00, // Bit Width
0x00, // Bit Offset 0x00, // Bit Offset
0x0000000000000000, // Address 0x0000000000000000, // Address
,) ,)
} }
}) })
*/ */
static char stream[] = { static char stream[] = {
0x08, 0x5F, 0x50, 0x43, 0x54, 0x12, 0x2C, /* 00000030 "0._PCT.," */ 0x08, 0x5F, 0x50, 0x43, 0x54, 0x12, 0x2C, /* 00000030 "0._PCT.," */
@@ -395,26 +395,26 @@ void acpigen_write_empty_PCT(void)
void acpigen_write_empty_PTC(void) void acpigen_write_empty_PTC(void)
{ {
/* /*
Name (_PTC, Package (0x02) Name (_PTC, Package (0x02)
{ {
ResourceTemplate () ResourceTemplate ()
{ {
Register (FFixedHW, Register (FFixedHW,
0x00, // Bit Width 0x00, // Bit Width
0x00, // Bit Offset 0x00, // Bit Offset
0x0000000000000000, // Address 0x0000000000000000, // Address
,) ,)
}, },
ResourceTemplate () ResourceTemplate ()
{ {
Register (FFixedHW, Register (FFixedHW,
0x00, // Bit Width 0x00, // Bit Width
0x00, // Bit Offset 0x00, // Bit Offset
0x0000000000000000, // Address 0x0000000000000000, // Address
,) ,)
} }
}) })
*/ */
acpi_addr_t addr = { acpi_addr_t addr = {
.space_id = ACPI_ADDRESS_SPACE_FIXED, .space_id = ACPI_ADDRESS_SPACE_FIXED,
@@ -478,10 +478,10 @@ void acpigen_write_STA(uint8_t status)
void acpigen_write_PPC(u8 nr) void acpigen_write_PPC(u8 nr)
{ {
/* /*
Method (_PPC, 0, NotSerialized) Method (_PPC, 0, NotSerialized)
{ {
Return (nr) Return (nr)
} }
*/ */
acpigen_write_method("_PPC", 0); acpigen_write_method("_PPC", 0);
/* return */ /* return */
@@ -498,10 +498,10 @@ void acpigen_write_PPC(u8 nr)
void acpigen_write_PPC_NVS(void) void acpigen_write_PPC_NVS(void)
{ {
/* /*
Method (_PPC, 0, NotSerialized) Method (_PPC, 0, NotSerialized)
{ {
Return (PPCM) Return (PPCM)
} }
*/ */
acpigen_write_method("_PPC", 0); acpigen_write_method("_PPC", 0);
/* return */ /* return */
@@ -514,12 +514,12 @@ void acpigen_write_PPC_NVS(void)
void acpigen_write_TPC(const char *gnvs_tpc_limit) void acpigen_write_TPC(const char *gnvs_tpc_limit)
{ {
/* /*
// Sample _TPC method // Sample _TPC method
Method (_TPC, 0, NotSerialized) Method (_TPC, 0, NotSerialized)
{ {
Return (\TLVL) Return (\TLVL)
} }
*/ */
acpigen_write_method("_TPC", 0); acpigen_write_method("_TPC", 0);
acpigen_emit_byte(0xa4); /* ReturnOp */ acpigen_emit_byte(0xa4); /* ReturnOp */
acpigen_emit_namestring(gnvs_tpc_limit); acpigen_emit_namestring(gnvs_tpc_limit);
@@ -611,13 +611,13 @@ void acpigen_write_CSD_package(u32 domain, u32 numprocs, CSD_coord coordtype, u3
void acpigen_write_TSS_package(int entries, acpi_tstate_t *tstate_list) void acpigen_write_TSS_package(int entries, acpi_tstate_t *tstate_list)
{ {
/* /*
Sample _TSS package with 100% and 50% duty cycles Sample _TSS package with 100% and 50% duty cycles
Name (_TSS, Package (0x02) Name (_TSS, Package (0x02)
{ {
Package(){100, 1000, 0, 0x00, 0) Package(){100, 1000, 0, 0x00, 0)
Package(){50, 520, 0, 0x18, 0) Package(){50, 520, 0, 0x18, 0)
}) })
*/ */
int i; int i;
acpi_tstate_t *tstate = tstate_list; acpi_tstate_t *tstate = tstate_list;