summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/cpu/x86/car.c4
-rw-r--r--src/cpu/x86/lapic/lapic.c8
-rw-r--r--src/cpu/x86/lapic/lapic_cpu_init.c2
-rw-r--r--src/cpu/x86/pae/pgtbl.c2
-rw-r--r--src/cpu/x86/smm/smihandler.c5
-rw-r--r--src/cpu/x86/smm/smm_module_handler.c2
-rw-r--r--src/cpu/x86/tsc/delay_tsc.c4
7 files changed, 14 insertions, 13 deletions
diff --git a/src/cpu/x86/car.c b/src/cpu/x86/car.c
index 825255e7db..606a35e2f6 100644
--- a/src/cpu/x86/car.c
+++ b/src/cpu/x86/car.c
@@ -62,7 +62,7 @@ void *car_get_var_ptr(void *var)
}
#if IS_ENABLED(CONFIG_PLATFORM_USES_FSP1_0)
- migrated_base=(char *)find_saved_temp_mem(
+ migrated_base = (char *)find_saved_temp_mem(
*(void **)CBMEM_FSP_HOB_PTR);
/* FSP 1.0 migrates the entire DCACHE RAM */
offset = (char *)var - (char *)CONFIG_DCACHE_RAM_BASE;
@@ -72,7 +72,7 @@ void *car_get_var_ptr(void *var)
#endif
if (migrated_base == NULL)
- die( "CAR: Could not find migration base!\n");
+ die("CAR: Could not find migration base!\n");
return &migrated_base[offset];
}
diff --git a/src/cpu/x86/lapic/lapic.c b/src/cpu/x86/lapic/lapic.c
index 12fad57366..4c351f914b 100644
--- a/src/cpu/x86/lapic/lapic.c
+++ b/src/cpu/x86/lapic/lapic.c
@@ -53,18 +53,18 @@ void setup_lapic(void)
(lapic_read_around(LAPIC_LVT0) &
~(LAPIC_LVT_MASKED | LAPIC_LVT_LEVEL_TRIGGER |
LAPIC_LVT_REMOTE_IRR | LAPIC_INPUT_POLARITY |
- LAPIC_SEND_PENDING |LAPIC_LVT_RESERVED_1 |
+ LAPIC_SEND_PENDING | LAPIC_LVT_RESERVED_1 |
LAPIC_DELIVERY_MODE_MASK))
- | (LAPIC_LVT_REMOTE_IRR |LAPIC_SEND_PENDING |
+ | (LAPIC_LVT_REMOTE_IRR | LAPIC_SEND_PENDING |
LAPIC_DELIVERY_MODE_EXTINT)
);
lapic_write_around(LAPIC_LVT1,
(lapic_read_around(LAPIC_LVT1) &
~(LAPIC_LVT_MASKED | LAPIC_LVT_LEVEL_TRIGGER |
LAPIC_LVT_REMOTE_IRR | LAPIC_INPUT_POLARITY |
- LAPIC_SEND_PENDING |LAPIC_LVT_RESERVED_1 |
+ LAPIC_SEND_PENDING | LAPIC_LVT_RESERVED_1 |
LAPIC_DELIVERY_MODE_MASK))
- | (LAPIC_LVT_REMOTE_IRR |LAPIC_SEND_PENDING |
+ | (LAPIC_LVT_REMOTE_IRR | LAPIC_SEND_PENDING |
LAPIC_DELIVERY_MODE_NMI)
);
diff --git a/src/cpu/x86/lapic/lapic_cpu_init.c b/src/cpu/x86/lapic/lapic_cpu_init.c
index b8973ee629..ff1a11438c 100644
--- a/src/cpu/x86/lapic/lapic_cpu_init.c
+++ b/src/cpu/x86/lapic/lapic_cpu_init.c
@@ -441,7 +441,7 @@ static void start_other_cpus(struct bus *cpu_bus, struct device *bsp_cpu)
continue;
}
- if (IS_ENABLED(CONFIG_PARALLEL_CPU_INIT) && (cpu==bsp_cpu))
+ if (IS_ENABLED(CONFIG_PARALLEL_CPU_INIT) && (cpu == bsp_cpu))
continue;
if (!cpu->enabled) {
diff --git a/src/cpu/x86/pae/pgtbl.c b/src/cpu/x86/pae/pgtbl.c
index 2c2f99d2b8..303b53fc78 100644
--- a/src/cpu/x86/pae/pgtbl.c
+++ b/src/cpu/x86/pae/pgtbl.c
@@ -90,7 +90,7 @@ void *map_2M_page(unsigned long page)
pdp[3].addr_lo = ((uint32_t)&pd[512*3])|1;
/* The first half of the page table is identity mapped */
for (i = 0; i < 1024; i++) {
- pd[i].addr_lo = ((i & 0x3ff) << 21)| 0xE3;
+ pd[i].addr_lo = ((i & 0x3ff) << 21) | 0xE3;
pd[i].addr_hi = 0;
}
/* The second half of the page table holds the mapped page */
diff --git a/src/cpu/x86/smm/smihandler.c b/src/cpu/x86/smm/smihandler.c
index cffd1322b0..c059189fc7 100644
--- a/src/cpu/x86/smm/smihandler.c
+++ b/src/cpu/x86/smm/smihandler.c
@@ -28,7 +28,8 @@ static int do_driver_init = 1;
typedef enum { SMI_LOCKED, SMI_UNLOCKED } smi_semaphore;
/* SMI multiprocessing semaphore */
-static volatile smi_semaphore smi_handler_status __attribute__ ((aligned (4))) = SMI_UNLOCKED;
+static __attribute__ ((aligned(4))) volatile smi_semaphore smi_handler_status
+ = SMI_UNLOCKED;
static int smi_obtain_lock(void)
{
@@ -138,7 +139,7 @@ void smi_handler(u32 smm_revision)
smi_backup_pci_address();
- node=nodeid();
+ node = nodeid();
console_init();
diff --git a/src/cpu/x86/smm/smm_module_handler.c b/src/cpu/x86/smm/smm_module_handler.c
index 49a2c1fe69..98ed1848a1 100644
--- a/src/cpu/x86/smm/smm_module_handler.c
+++ b/src/cpu/x86/smm/smm_module_handler.c
@@ -28,7 +28,7 @@ typedef enum { SMI_LOCKED, SMI_UNLOCKED } smi_semaphore;
/* SMI multiprocessing semaphore */
static volatile
-smi_semaphore smi_handler_status __attribute__ ((aligned (4))) = SMI_UNLOCKED;
+__attribute__ ((aligned(4))) smi_semaphore smi_handler_status = SMI_UNLOCKED;
static int smi_obtain_lock(void)
{
diff --git a/src/cpu/x86/tsc/delay_tsc.c b/src/cpu/x86/tsc/delay_tsc.c
index 3f98a1f163..0c5dc9e60b 100644
--- a/src/cpu/x86/tsc/delay_tsc.c
+++ b/src/cpu/x86/tsc/delay_tsc.c
@@ -70,8 +70,8 @@ static unsigned long calibrate_tsc_with_pit(void)
/* 64-bit subtract - gcc just messes up with long longs */
__asm__("subl %2,%0\n\t"
"sbbl %3,%1"
- :"=a" (end.lo), "=d" (end.hi)
- :"g" (start.lo), "g" (start.hi),
+ : "=a" (end.lo), "=d" (end.hi)
+ : "g" (start.lo), "g" (start.hi),
"0" (end.lo), "1" (end.hi));
/* Error: ECPUTOOFAST */