[coreboot-gerrit] Patch set updated for coreboot: src/include: Code formating
HAOUAS Elyes (ehaouas@noos.fr)
gerrit at coreboot.org
Thu Sep 1 20:30:23 CEST 2016
HAOUAS Elyes (ehaouas at noos.fr) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/16390
-gerrit
commit cf5fe1d17a763ba11c2d23382e355b077228b434
Author: Elyes HAOUAS <ehaouas at noos.fr>
Date: Thu Sep 1 19:01:41 2016 +0200
src/include: Code formating
Change-Id: Ic8ffd26e61c0c3f27872699bb6aa9c39204155b7
Signed-off-by: Elyes HAOUAS <ehaouas at noos.fr>
---
src/include/console/console.h | 4 +--
src/include/cpu/amd/model_fxx_rev.h | 72 ++++++++++++++++++-------------------
src/include/cpu/x86/bist.h | 2 +-
src/include/cpu/x86/msr.h | 10 +++---
src/include/cpu/x86/tsc.h | 2 +-
src/include/reset.h | 2 +-
src/include/smp/spinlock.h | 10 +++---
src/include/string.h | 16 ++++-----
src/include/watchdog.h | 2 +-
9 files changed, 59 insertions(+), 61 deletions(-)
diff --git a/src/include/console/console.h b/src/include/console/console.h
index 202d474..2392ddf 100644
--- a/src/include/console/console.h
+++ b/src/include/console/console.h
@@ -50,8 +50,8 @@ int console_log_level(int msg_level);
int do_printk(int msg_level, const char *fmt, ...) __attribute__((format(printf, 2, 3)));
void do_putchar(unsigned char byte);
-#define printk(LEVEL, fmt, args...) \
- do { do_printk(LEVEL, fmt, ##args); } while(0)
+#define printk(LEVEL, fmt, args...) \
+ do { do_printk(LEVEL, fmt, ##args); } while (0)
#else
static inline void console_init(void) {}
diff --git a/src/include/cpu/amd/model_fxx_rev.h b/src/include/cpu/amd/model_fxx_rev.h
index 02a50d1..b133f3a 100644
--- a/src/include/cpu/amd/model_fxx_rev.h
+++ b/src/include/cpu/amd/model_fxx_rev.h
@@ -8,88 +8,88 @@ static inline int is_cpu_rev_a0(void)
}
static inline int is_cpu_pre_c0(void)
{
- return (cpuid_eax(1) & 0xfffef) < 0x0f48;
+ return (cpuid_eax(1) & 0xfffef) < 0x0f48;
}
static inline int is_cpu_c0(void)
{
- return (cpuid_eax(1) & 0xfffef) == 0x0f48;
+ return (cpuid_eax(1) & 0xfffef) == 0x0f48;
}
static inline int is_cpu_pre_b3(void)
{
- return (cpuid_eax(1) & 0xfffef) < 0x0f41;
+ return (cpuid_eax(1) & 0xfffef) < 0x0f41;
}
static inline int is_cpu_b3(void)
{
- return (cpuid_eax(1) & 0xfffef) == 0x0f41;
+ return (cpuid_eax(1) & 0xfffef) == 0x0f41;
}
//AMD_D0_SUPPORT
static inline int is_cpu_pre_d0(void)
{
- return (cpuid_eax(1) & 0xfff0f) < 0x10f00;
+ return (cpuid_eax(1) & 0xfff0f) < 0x10f00;
}
static inline int is_cpu_d0(void)
{
- return (cpuid_eax(1) & 0xfff0f) == 0x10f00;
+ return (cpuid_eax(1) & 0xfff0f) == 0x10f00;
}
//AMD_E0_SUPPORT
static inline int is_cpu_pre_e0(void)
{
- return (cpuid_eax(1) & 0xfff0f) < 0x20f00;
+ return (cpuid_eax(1) & 0xfff0f) < 0x20f00;
}
static inline int is_cpu_e0(void)
{
- return (cpuid_eax(1) & 0xfff00) == 0x20f00;
+ return (cpuid_eax(1) & 0xfff00) == 0x20f00;
}
//AMD_F0_SUPPORT
static inline int is_cpu_pre_f0(void)
{
- return (cpuid_eax(1) & 0xfff0f) < 0x40f00;
+ return (cpuid_eax(1) & 0xfff0f) < 0x40f00;
}
static inline int is_cpu_f0(void)
{
- return (cpuid_eax(1) & 0xfff00) == 0x40f00;
+ return (cpuid_eax(1) & 0xfff00) == 0x40f00;
}
static inline int is_cpu_pre_f2(void)
{
- return (cpuid_eax(1) & 0xfff0f) < 0x40f02;
+ return (cpuid_eax(1) & 0xfff0f) < 0x40f02;
}
#ifdef __PRE_RAM__
static inline int is_e0_later_in_bsp(int nodeid)
{
- uint32_t val;
- uint32_t val_old;
- int e0_later;
+ uint32_t val;
+ uint32_t val_old;
+ int e0_later;
if (IS_ENABLED(CONFIG_K8_REV_F_SUPPORT))
return 1;
- if (nodeid==0) { // we don't need to do that for node 0 in core0/node0
- return !is_cpu_pre_e0();
- }
- // d0 will be treated as e0 with this methods, but the d0 nb_cfg_54 always 0
- device_t dev;
- dev = PCI_DEV(0, 0x18+nodeid,2);
- val_old = pci_read_config32(dev, 0x80);
- val = val_old;
- val |= (1<<3);
- pci_write_config32(dev, 0x80, val);
- val = pci_read_config32(dev, 0x80);
- e0_later = !!(val & (1<<3));
- if (e0_later) { // pre_e0 bit 3 always be 0 and can not be changed
- pci_write_config32(dev, 0x80, val_old); // restore it
- }
-
- return e0_later;
+ if (nodeid==0) { // we don't need to do that for node 0 in core0/node0
+ return !is_cpu_pre_e0();
+ }
+ // d0 will be treated as e0 with this methods, but the d0 nb_cfg_54 always 0
+ device_t dev;
+ dev = PCI_DEV(0, 0x18+nodeid,2);
+ val_old = pci_read_config32(dev, 0x80);
+ val = val_old;
+ val |= (1<<3);
+ pci_write_config32(dev, 0x80, val);
+ val = pci_read_config32(dev, 0x80);
+ e0_later = !!(val & (1<<3));
+ if (e0_later) { // pre_e0 bit 3 always be 0 and can not be changed
+ pci_write_config32(dev, 0x80, val_old); // restore it
+ }
+
+ return e0_later;
}
static inline int is_cpu_f0_in_bsp(int nodeid)
@@ -100,18 +100,18 @@ static inline int is_cpu_f0_in_bsp(int nodeid)
return 0;
dev = PCI_DEV(0, 0x18+nodeid, 3);
dword = pci_read_config32(dev, 0xfc);
- return (dword & 0xfff00) == 0x40f00;
+ return (dword & 0xfff00) == 0x40f00;
}
static inline int is_cpu_pre_f2_in_bsp(int nodeid)
{
- uint32_t dword;
+ uint32_t dword;
device_t dev;
if (!IS_ENABLED(CONFIG_K8_REV_F_SUPPORT))
return 1;
- dev = PCI_DEV(0, 0x18+nodeid, 3);
- dword = pci_read_config32(dev, 0xfc);
- return (dword & 0xfff0f) < 0x40f02;
+ dev = PCI_DEV(0, 0x18+nodeid, 3);
+ dword = pci_read_config32(dev, 0xfc);
+ return (dword & 0xfff0f) < 0x40f02;
}
#else
diff --git a/src/include/cpu/x86/bist.h b/src/include/cpu/x86/bist.h
index 648a789..24d4025 100644
--- a/src/include/cpu/x86/bist.h
+++ b/src/include/cpu/x86/bist.h
@@ -4,7 +4,7 @@
static void report_bist_failure(u32 bist)
{
if (bist != 0) {
- printk(BIOS_EMERG, "BIST failed: %08x", bist);
+ printk(BIOS_EMERG, "BIST failed: %08x", bist);
die("\n");
}
}
diff --git a/src/include/cpu/x86/msr.h b/src/include/cpu/x86/msr.h
index db35ef1..f830f3b 100644
--- a/src/include/cpu/x86/msr.h
+++ b/src/include/cpu/x86/msr.h
@@ -25,8 +25,8 @@ typedef struct msr_struct
typedef struct msrinit_struct
{
- unsigned index;
- msr_t msr;
+ unsigned index;
+ msr_t msr;
} msrinit_t;
#if IS_ENABLED(CONFIG_SOC_SETS_MSRS)
@@ -39,8 +39,7 @@ static inline __attribute__((always_inline)) msr_t rdmsr(unsigned index)
return soc_msr_read(index);
}
-static inline __attribute__((always_inline)) void wrmsr(unsigned index,
- msr_t msr)
+static inline __attribute__((always_inline)) void wrmsr(unsigned index, msr_t msr)
{
soc_msr_write(index, msr);
}
@@ -67,8 +66,7 @@ static inline __attribute__((always_inline)) msr_t rdmsr(unsigned index)
return result;
}
-static inline __attribute__((always_inline)) void wrmsr(unsigned index,
- msr_t msr)
+static inline __attribute__((always_inline)) void wrmsr(unsigned index, msr_t msr)
{
__asm__ __volatile__ (
"wrmsr"
diff --git a/src/include/cpu/x86/tsc.h b/src/include/cpu/x86/tsc.h
index 5cf4644..e4ca0e7 100644
--- a/src/include/cpu/x86/tsc.h
+++ b/src/include/cpu/x86/tsc.h
@@ -56,7 +56,7 @@ static inline unsigned long long rdtscll(void)
static inline uint64_t tsc_to_uint64(tsc_t tstamp)
{
- return (((uint64_t)tstamp.hi) << 32) + tstamp.lo;
+ return (((uint64_t)tstamp.hi) << 32) + tstamp.lo;
}
#endif
diff --git a/src/include/reset.h b/src/include/reset.h
index 67f58db..f7501b5 100644
--- a/src/include/reset.h
+++ b/src/include/reset.h
@@ -4,7 +4,7 @@
#if CONFIG_HAVE_HARD_RESET
void hard_reset(void);
#else
-#define hard_reset() do {} while(0)
+#define hard_reset() do {} while (0)
#endif
void soft_reset(void);
void cpu_reset(void);
diff --git a/src/include/smp/spinlock.h b/src/include/smp/spinlock.h
index 87298b1..f181f45 100644
--- a/src/include/smp/spinlock.h
+++ b/src/include/smp/spinlock.h
@@ -6,12 +6,12 @@
#else /* !CONFIG_SMP */
#define DECLARE_SPIN_LOCK(x)
-#define barrier() do {} while(0)
+#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)
+#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 /* SMP_SPINLOCK_H */
diff --git a/src/include/string.h b/src/include/string.h
index 125c676..5b2486a 100644
--- a/src/include/string.h
+++ b/src/include/string.h
@@ -24,7 +24,7 @@ int snprintf(char * buf, size_t size, const char *fmt, ...);
static inline size_t strnlen(const char *src, size_t max)
{
size_t i = 0;
- while((*src++) && (i < max)) {
+ while ((*src++) && (i < max)) {
i++;
}
return i;
@@ -33,7 +33,7 @@ static inline size_t strnlen(const char *src, size_t max)
static inline size_t strlen(const char *src)
{
size_t i = 0;
- while(*src++) {
+ while (*src++) {
i++;
}
return i;
@@ -154,15 +154,15 @@ static inline int islower(int c)
static inline int toupper(int c)
{
- if (islower(c))
- c -= 'a'-'A';
- return c;
+ if (islower(c))
+ c -= 'a'-'A';
+ return c;
}
static inline int tolower(int c)
{
- if (isupper(c))
- c -= 'A'-'a';
- return c;
+ if (isupper(c))
+ c -= 'A'-'a';
+ return c;
}
#endif /* STRING_H */
diff --git a/src/include/watchdog.h b/src/include/watchdog.h
index b94cd4d..8514158 100644
--- a/src/include/watchdog.h
+++ b/src/include/watchdog.h
@@ -4,7 +4,7 @@
#if CONFIG_USE_WATCHDOG_ON_BOOT
void watchdog_off(void);
#else
-#define watchdog_off() while(0) {}
+#define watchdog_off() while (0) {}
#endif
#endif /* WATCHDOG_H */
More information about the coreboot-gerrit
mailing list